Skip to content

Commit 81d7fd3

Browse files
author
Steve King
committed
* Added support for placeholder attribute as requested in issue #143 and #136
* Created examples - Basic (no toolbar) - Simple Toolbar - Clear formatting button as per request #138 * Moved layout to css/ src/ js/ * Added :focus support as per request #141 * Validated bower.json as per request #134 (Valid JSON)
1 parent 9a58103 commit 81d7fd3

File tree

9 files changed

+307
-8
lines changed

9 files changed

+307
-8
lines changed

‎CHANGES‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,22 @@
1+
1.0.2 - Merged some extras
2+
3+
* Added support for placeholder attribute as requested in issue #143 and #136
4+
* Created examples
5+
- Basic (no toolbar)
6+
- Simple Toolbar
7+
- Clear formatting button as per request #138
8+
* Moved layout to css/ src/ js/
9+
* Added :focus support as per request #141
10+
* Validated bower.json as per request #134 (Valid JSON)
11+
12+
113
1.0.1 - Released to the universe
214

315
* General improvements and fixes (see graph)
416
* Merged a number of wild forks in
517
* Fixed issue #23 (NS_ERROR_UNEXPECTED) by @jordandh
618
* Fixed issue #118 (Format block buttons) by @beatnbite
7-
* Multiple instances support by @brutuscat
19+
* Multiple instances support by @brutuscat as per request #140
820
* Fix range selection in IE8 by @tilleryd
921
* Added throttle to update to improve performance on old browsers by @VictorBjelkholm
1022
* UglifyJS Version of the code (bootstrap-wysiwyg.min.js)

‎bower.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "bootstrap-wysiwyg",
33
"description": "Tiny Bootstrap and JQuery Based WISWYG rich text editor based on browser execCommand.",
4-
"version": "1.0.1",
4+
"version": "1.0.2",
55
"keywords": [
66
"css",
77
"js",

index.css renamed to css/style.css

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
* of the key things about the widget is that it allows you to do your own styling!
33
*/
44

5+
56
#editor {
67
max-height: 250px;
78
height: 250px;
@@ -17,6 +18,15 @@
1718
overflow: scroll;
1819
outline: none;
1920
}
21+
#editor:focus{
22+
border-color:rgba(82, 168, 236, 0.8);
23+
outline:0;
24+
outline:thin dotted \9;
25+
-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
26+
-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
27+
box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
28+
}
29+
2030
#voiceBtn {
2131
width: 20px;
2232
color: transparent;

‎examples/basic.html‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="utf-8" />
5+
<title>Tiny, opensource, Bootstrap WYSIWYG rich text editor</title>
6+
7+
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
8+
9+
<link href="../external/google-code-prettify/prettify.css" rel="stylesheet" />
10+
<link rel="stylesheet"
11+
href="http://netdna.bootstrapcdn.com/bootstrap/3.0.3/css/bootstrap.min.css" />
12+
<link
13+
href="http://netdna.bootstrapcdn.com/font-awesome/3.0.2/css/font-awesome.css"
14+
rel="stylesheet" />
15+
<script
16+
src="http://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
17+
<script src="../external/jquery.hotkeys.js"></script>
18+
<script
19+
src="http://netdna.bootstrapcdn.com/bootstrap/3.0.3/js/bootstrap.min.js"></script>
20+
<script src="../external/google-code-prettify/prettify.js"></script>
21+
22+
<link href="../css/style.css" rel="stylesheet" />
23+
<script src="../src/bootstrap-wysiwyg.js"></script>
24+
</head>
25+
26+
<body>
27+
<div class="container">
28+
<h1>Basic editor, no fancy bits.</h1>
29+
<div id="editor" class="lead" placeholder="This is a basic example with no toolbars."></div>
30+
<div id="editorPreview"></div>
31+
<p style="text-align: center;">
32+
<a class="btn btn-large btn-default jumbo"
33+
href="#!" onClick="$('#editorPreview').html($('#editor').html());">Submit</a>
34+
</p>
35+
</div>
36+
<script type='text/javascript'>$('#editor').wysiwyg();</script>
37+
</body>
38+
</html>

‎examples/clear-formatting.html‎

Lines changed: 124 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="utf-8" />
5+
<title>Tiny, opensource, Bootstrap WYSIWYG rich text editor</title>
6+
7+
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
8+
9+
<link href="../external/google-code-prettify/prettify.css" rel="stylesheet" />
10+
<link rel="stylesheet"
11+
href="http://netdna.bootstrapcdn.com/bootstrap/3.0.3/css/bootstrap.min.css" />
12+
<link
13+
href="http://netdna.bootstrapcdn.com/font-awesome/3.0.2/css/font-awesome.css"
14+
rel="stylesheet" />
15+
<script
16+
src="http://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
17+
<script src="../external/jquery.hotkeys.js"></script>
18+
<script
19+
src="http://netdna.bootstrapcdn.com/bootstrap/3.0.3/js/bootstrap.min.js"></script>
20+
<script src="../external/google-code-prettify/prettify.js"></script>
21+
22+
<link href="../css/style.css" rel="stylesheet" />
23+
<script src="../src/bootstrap-wysiwyg.js"></script>
24+
</head>
25+
26+
<body>
27+
<div class="container">
28+
29+
<h1>Simple Editor with Toolbar</h1>
30+
<div class="btn-toolbar" data-role="editor-toolbar"
31+
data-target="#editor">
32+
<div class="btn-group">
33+
<a class="btn btn-default dropdown-toggle" data-toggle="dropdown"
34+
title="Font Size"><i class="icon-text-height"></i>&nbsp;<b
35+
class="caret"></b>
36+
</a>
37+
<ul class="dropdown-menu">
38+
<li><a data-edit="fontSize 5"><font size="5">Huge</font>
39+
</a>
40+
</li>
41+
<li><a data-edit="fontSize 3"><font size="3">Normal</font>
42+
</a>
43+
</li>
44+
<li><a data-edit="fontSize 1"><font size="1">Small</font>
45+
</a>
46+
</li>
47+
</ul>
48+
</div>
49+
<div class="btn-group">
50+
<a class="btn btn-default" data-edit="bold"
51+
title="Bold (Ctrl/Cmd+B)"><i class="icon-bold"></i>
52+
</a> <a class="btn btn-default" data-edit="italic"
53+
title="Italic (Ctrl/Cmd+I)"><i class="icon-italic"></i>
54+
</a> <a class="btn btn-default" data-edit="strikethrough"
55+
title="Strikethrough"><i class="icon-strikethrough"></i>
56+
</a> <a class="btn btn-default" data-edit="underline"
57+
title="Underline (Ctrl/Cmd+U)"><i class="icon-underline"></i>
58+
</a>
59+
</div>
60+
<div class="btn-group">
61+
<a class="btn btn-default" data-edit="insertunorderedlist"
62+
title="Bullet list"><i class="icon-list-ul"></i>
63+
</a> <a class="btn btn-default" data-edit="insertorderedlist"
64+
title="Number list"><i class="icon-list-ol"></i>
65+
</a> <a class="btn btn-default" data-edit="outdent"
66+
title="Reduce indent (Shift+Tab)"><i class="icon-indent-left"></i>
67+
</a> <a class="btn btn-default" data-edit="indent" title="Indent (Tab)"><i
68+
class="icon-indent-right"></i>
69+
</a>
70+
</div>
71+
<div class="btn-group">
72+
<a class="btn btn-default" data-edit="justifyleft"
73+
title="Align Left (Ctrl/Cmd+L)"><i class="icon-align-left"></i>
74+
</a> <a class="btn btn-default" data-edit="justifycenter"
75+
title="Center (Ctrl/Cmd+E)"><i class="icon-align-center"></i>
76+
</a> <a class="btn btn-default" data-edit="justifyright"
77+
title="Align Right (Ctrl/Cmd+R)"><i class="icon-align-right"></i>
78+
</a> <a class="btn btn-default" data-edit="justifyfull"
79+
title="Justify (Ctrl/Cmd+J)"><i class="icon-align-justify"></i>
80+
</a>
81+
</div>
82+
<div class="btn-group">
83+
<a class="btn btn-default dropdown-toggle" data-toggle="dropdown"
84+
title="Hyperlink"><i class="icon-link"></i>
85+
</a>
86+
<div class="dropdown-menu input-append">
87+
<input class="span2" placeholder="URL" type="text"
88+
data-edit="createLink" />
89+
<button class="btn" type="button">Add</button>
90+
</div>
91+
</div>
92+
93+
<div class="btn-group">
94+
<a class="btn btn-default" data-edit="unlink"
95+
title="Remove Hyperlink"><i class="icon-cut"></i>
96+
</a> <a class="btn btn-default"
97+
title="Insert picture (or just drag & drop)" id="pictureBtn">
98+
<i class="icon-picture"></i> <input type="file"
99+
data-role="magic-overlay" data-target="#pictureBtn"
100+
data-edit="insertImage" /> </a>
101+
</div>
102+
<div class="btn-group">
103+
<a class="btn btn-default" data-edit="undo"
104+
title="Undo (Ctrl/Cmd+Z)"><i class="icon-undo"></i>
105+
</a> <a class="btn btn-default" data-edit="redo"
106+
title="Redo (Ctrl/Cmd+Y)"><i class="icon-repeat"></i>
107+
</a>
108+
109+
<a class="btn btn-default" data-edit="clearformat"
110+
title="Clear Formatting" onClick="$('#editor').html($('#editor').text());"><i class='glyphicon glyphicon-fire'></i>
111+
</a>
112+
113+
</div>
114+
</div>
115+
<div id="editor" class="lead" placeholder="This is a basic example with a simple toolbar."></div>
116+
<div id="editorPreview"></div>
117+
<p style="text-align: center;">
118+
<a class="btn btn-large btn-default jumbo"
119+
href="#!" onClick="$('#editorPreview').html($('#editor').html());">Submit</a>
120+
</p>
121+
</div>
122+
<script type='text/javascript'>$('#editor').wysiwyg();</script>
123+
</body>
124+
</html>

‎examples/simple-toolbar.html‎

Lines changed: 119 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,119 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="utf-8" />
5+
<title>Tiny, opensource, Bootstrap WYSIWYG rich text editor</title>
6+
7+
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
8+
9+
<link href="../external/google-code-prettify/prettify.css" rel="stylesheet" />
10+
<link rel="stylesheet"
11+
href="http://netdna.bootstrapcdn.com/bootstrap/3.0.3/css/bootstrap.min.css" />
12+
<link
13+
href="http://netdna.bootstrapcdn.com/font-awesome/3.0.2/css/font-awesome.css"
14+
rel="stylesheet" />
15+
<script
16+
src="http://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
17+
<script src="../external/jquery.hotkeys.js"></script>
18+
<script
19+
src="http://netdna.bootstrapcdn.com/bootstrap/3.0.3/js/bootstrap.min.js"></script>
20+
<script src="../external/google-code-prettify/prettify.js"></script>
21+
22+
<link href="../css/style.css" rel="stylesheet" />
23+
<script src="../src/bootstrap-wysiwyg.js"></script>
24+
</head>
25+
26+
<body>
27+
<div class="container">
28+
29+
<h1>Simple Editor with Toolbar</h1>
30+
<div class="btn-toolbar" data-role="editor-toolbar"
31+
data-target="#editor">
32+
<div class="btn-group">
33+
<a class="btn btn-default dropdown-toggle" data-toggle="dropdown"
34+
title="Font Size"><i class="icon-text-height"></i>&nbsp;<b
35+
class="caret"></b>
36+
</a>
37+
<ul class="dropdown-menu">
38+
<li><a data-edit="fontSize 5"><font size="5">Huge</font>
39+
</a>
40+
</li>
41+
<li><a data-edit="fontSize 3"><font size="3">Normal</font>
42+
</a>
43+
</li>
44+
<li><a data-edit="fontSize 1"><font size="1">Small</font>
45+
</a>
46+
</li>
47+
</ul>
48+
</div>
49+
<div class="btn-group">
50+
<a class="btn btn-default" data-edit="bold"
51+
title="Bold (Ctrl/Cmd+B)"><i class="icon-bold"></i>
52+
</a> <a class="btn btn-default" data-edit="italic"
53+
title="Italic (Ctrl/Cmd+I)"><i class="icon-italic"></i>
54+
</a> <a class="btn btn-default" data-edit="strikethrough"
55+
title="Strikethrough"><i class="icon-strikethrough"></i>
56+
</a> <a class="btn btn-default" data-edit="underline"
57+
title="Underline (Ctrl/Cmd+U)"><i class="icon-underline"></i>
58+
</a>
59+
</div>
60+
<div class="btn-group">
61+
<a class="btn btn-default" data-edit="insertunorderedlist"
62+
title="Bullet list"><i class="icon-list-ul"></i>
63+
</a> <a class="btn btn-default" data-edit="insertorderedlist"
64+
title="Number list"><i class="icon-list-ol"></i>
65+
</a> <a class="btn btn-default" data-edit="outdent"
66+
title="Reduce indent (Shift+Tab)"><i class="icon-indent-left"></i>
67+
</a> <a class="btn btn-default" data-edit="indent" title="Indent (Tab)"><i
68+
class="icon-indent-right"></i>
69+
</a>
70+
</div>
71+
<div class="btn-group">
72+
<a class="btn btn-default" data-edit="justifyleft"
73+
title="Align Left (Ctrl/Cmd+L)"><i class="icon-align-left"></i>
74+
</a> <a class="btn btn-default" data-edit="justifycenter"
75+
title="Center (Ctrl/Cmd+E)"><i class="icon-align-center"></i>
76+
</a> <a class="btn btn-default" data-edit="justifyright"
77+
title="Align Right (Ctrl/Cmd+R)"><i class="icon-align-right"></i>
78+
</a> <a class="btn btn-default" data-edit="justifyfull"
79+
title="Justify (Ctrl/Cmd+J)"><i class="icon-align-justify"></i>
80+
</a>
81+
</div>
82+
<div class="btn-group">
83+
<a class="btn btn-default dropdown-toggle" data-toggle="dropdown"
84+
title="Hyperlink"><i class="icon-link"></i>
85+
</a>
86+
<div class="dropdown-menu input-append">
87+
<input class="span2" placeholder="URL" type="text"
88+
data-edit="createLink" />
89+
<button class="btn" type="button">Add</button>
90+
</div>
91+
</div>
92+
93+
<div class="btn-group">
94+
<a class="btn btn-default" data-edit="unlink"
95+
title="Remove Hyperlink"><i class="icon-cut"></i>
96+
</a> <a class="btn btn-default"
97+
title="Insert picture (or just drag & drop)" id="pictureBtn">
98+
<i class="icon-picture"></i> <input type="file"
99+
data-role="magic-overlay" data-target="#pictureBtn"
100+
data-edit="insertImage" /> </a>
101+
</div>
102+
<div class="btn-group">
103+
<a class="btn btn-default" data-edit="undo"
104+
title="Undo (Ctrl/Cmd+Z)"><i class="icon-undo"></i>
105+
</a> <a class="btn btn-default" data-edit="redo"
106+
title="Redo (Ctrl/Cmd+Y)"><i class="icon-repeat"></i>
107+
</a>
108+
</div>
109+
</div>
110+
<div id="editor" class="lead" placeholder="This is a basic example with a simple toolbar."></div>
111+
<div id="editorPreview"></div>
112+
<p style="text-align: center;">
113+
<a class="btn btn-large btn-default jumbo"
114+
href="#!" onClick="$('#editorPreview').html($('#editor').html());">Submit</a>
115+
</p>
116+
</div>
117+
<script type='text/javascript'>$('#editor').wysiwyg();</script>
118+
</body>
119+
</html>

‎index.html‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@
99
content="opensource rich wysiwyg text editor jquery bootstrap execCommand html5" />
1010
<meta name="description"
1111
content="This tiny jQuery Bootstrap WYSIWYG plugin turns any DIV into a HTML5 rich text editor" />
12-
<link rel="apple-touch-icon"
13-
href="//mindmup.s3.amazonaws.com/lib/img/apple-touch-icon.png" />
14-
<link rel="shortcut icon"
15-
href="http://mindmup.s3.amazonaws.com/lib/img/favicon.ico" />
1612
<link href="external/google-code-prettify/prettify.css" rel="stylesheet" />
1713
<link rel="stylesheet"
1814
href="http://netdna.bootstrapcdn.com/bootstrap/3.0.3/css/bootstrap.min.css" />
@@ -25,8 +21,8 @@
2521
<script
2622
src="http://netdna.bootstrapcdn.com/bootstrap/3.0.3/js/bootstrap.min.js"></script>
2723
<script src="external/google-code-prettify/prettify.js"></script>
28-
<link href="index.css" rel="stylesheet" />
29-
<script src="bootstrap-wysiwyg.js"></script>
24+
<link href="css/style.css" rel="stylesheet" />
25+
<script src="src/bootstrap-wysiwyg.js"></script>
3026
</head>
3127
<body>
3228

bootstrap-wysiwyg.min.js renamed to js/bootstrap-wysiwyg.min.js

File renamed without changes.

bootstrap-wysiwyg.js renamed to src/bootstrap-wysiwyg.js

File renamed without changes.

0 commit comments

Comments
 (0)