Skip to content

Commit fe268ae

Browse files
steveathonsteveathon
committed
Merge pull request #41 from RandomlyKnighted/master
Remove call to library dependencies located in external folder and tagging.
2 parents 5a1c4f7 + 9d49573 commit fe268ae

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+230
-366
lines changed

‎CHANGES

+12
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
11
* Add change event callback
22

3+
1.0.3 - Bug fixes and updated content
4+
* General bug fixes and improvements
5+
* Added gulpfile.js to streamline
6+
* Created example
7+
- Multiple editors (on a single page)
8+
* Updated content
9+
- Updated jquery.hotkeys
10+
- Updated Bootstrap to version 3.3.4
11+
- Updated Font Awesome to version 4.3.0
12+
- Updated jQuery to version 2.1.4
13+
- Updated Google Code Prettify to version 1.0.4
14+
315
1.0.2 - Merged some extras
416

517
* Added support for placeholder attribute as requested in issue #143 and #136

‎css/style.css

+24-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
2828
}
2929

30-
#voiceBtn {
30+
.voiceBtn {
3131
width: 20px;
3232
color: transparent;
3333
background-color: transparent;
@@ -53,6 +53,29 @@ div[data-role="editor-toolbar"] {
5353
.btn-toolbar {
5454
padding: 10px 0px 10px 0px;
5555
}
56+
57+
[contentEditable=true]:empty:not(:focus):before {
58+
content:attr(data-placeholder)
59+
}
60+
5661
.placeholderText {
5762
color: #777;
63+
}
64+
65+
/*
66+
Font Sizes
67+
fs represents the font-size attribute; therefore,
68+
fs-five would be the equivalent to font-size: 5;
69+
*/
70+
71+
.fs-One {
72+
font-size: x-small;
73+
}
74+
75+
.fs-Three {
76+
font-size: medium;
77+
}
78+
79+
.fs-Five {
80+
font-size: x-large;
5881
}

‎examples/basic.html

+4-5
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,22 @@
55
<meta http-equiv="X-UA-Compatible" content="IE=edge">
66
<meta name="viewport" content="width=device-width, initial-scale=1">
77
<title>A tiny, opensource, Bootstrap WYSIWYG rich text editor</title>
8-
9-
<link href="../external/google-code-prettify/prettify.css" rel="stylesheet" />
8+
<link href="../bower_components/google-code-prettify/src/prettify.css" rel="stylesheet" />
109
<link rel="stylesheet" href="http://netdna.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css" />
1110
<link rel="stylesheet" href="http://netdna.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.css" />
1211
<link href="../css/style.css" rel="stylesheet" />
1312

1413
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
15-
<script src="../external/jquery.hotkeys.js"></script>
14+
<script src="../bower_components/jquery.hotkeys/jquery.hotkeys.js"></script>
1615
<script src="http://netdna.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script>
17-
<script src="../external/google-code-prettify/prettify.js"></script>
16+
<script src="../bower_components/google-code-prettify/src/prettify.js"></script>
1817
<script src="../src/bootstrap-wysiwyg.js"></script>
1918
</head>
2019

2120
<body>
2221
<div class="container">
2322
<h1>Basic editor, no fancy bits.</h1>
24-
<div id="editor" class="lead" placeholder="This is a basic example with no toolbars."></div>
23+
<div id="editor" class="lead" data-placeholder="This is a basic example with no toolbars."></div>
2524
<div id="editorPreview"></div>
2625
<p style="text-align: center;">
2726
<a class="btn btn-large btn-default jumbo"

‎examples/clear-formatting.html

+10-10
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<meta http-equiv="X-UA-Compatible" content="IE=edge">
66
<meta name="viewport" content="width=device-width, initial-scale=1">
77
<title>A tiny, opensource, Bootstrap WYSIWYG rich text editor</title>
8-
<link href="../external/google-code-prettify/prettify.css" rel="stylesheet" />
8+
<link href="../bower_components/google-code-prettify/src/prettify.css" rel="stylesheet" />
99
<link rel="stylesheet" href="http://netdna.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css" />
1010
<link href="http://netdna.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.css" rel="stylesheet" />
1111
<link href="../css/style.css" rel="stylesheet" />
@@ -20,9 +20,9 @@ <h1>Simple Editor with Toolbar</h1>
2020
<div class="btn-group">
2121
<a class="btn btn-default dropdown-toggle" data-toggle="dropdown" title="Font Size"><i class="fa fa-text-height"></i>&nbsp;<b class="caret"></b></a>
2222
<ul class="dropdown-menu">
23-
<li><a data-edit="fontSize 5"><font size="5">Huge</font></a></li>
24-
<li><a data-edit="fontSize 3"><font size="3">Normal</font></a></li>
25-
<li><a data-edit="fontSize 1"><font size="1">Small</font></a></li>
23+
<li><a data-edit="fontSize 5" class="fs-Five">Huge</a></li>
24+
<li><a data-edit="fontSize 3" class="fs-Three">Normal</a></li>
25+
<li><a data-edit="fontSize 1" class="fs-One">Small</a></li>
2626
</ul>
2727
</div>
2828
<div class="btn-group">
@@ -46,34 +46,34 @@ <h1>Simple Editor with Toolbar</h1>
4646
<div class="btn-group">
4747
<a class="btn btn-default dropdown-toggle" data-toggle="dropdown" title="Hyperlink"><i class="fa fa-link"></i></a>
4848
<div class="dropdown-menu input-append">
49-
<input class="span2" placeholder="URL" type="text" data-edit="createLink" />
49+
<input placeholder="URL" type="text" data-edit="createLink" />
5050
<button class="btn" type="button">Add</button>
5151
</div>
5252
</div>
5353

5454
<div class="btn-group">
5555
<a class="btn btn-default" data-edit="unlink" title="Remove Hyperlink"><i class="fa fa-unlink"></i></a>
56-
<a class="btn btn-default" title="Insert picture (or just drag & drop)" id="pictureBtn"><i class="fa fa-picture-o"></i>
56+
<span class="btn btn-default" title="Insert picture (or just drag & drop)" id="pictureBtn"><i class="fa fa-picture-o"></i>
5757
<input type="file" data-role="magic-overlay" data-target="#pictureBtn" data-edit="insertImage" />
58-
</a>
58+
</span>
5959
</div>
6060
<div class="btn-group">
6161
<a class="btn btn-default" data-edit="undo" title="Undo (Ctrl/Cmd+Z)"><i class="fa fa-undo"></i></a>
6262
<a class="btn btn-default" data-edit="redo" title="Redo (Ctrl/Cmd+Y)"><i class="fa fa-repeat"></i></a>
6363
<a class="btn btn-default" data-edit="clearformat" title="Clear Formatting" onClick="$('#editor').html($('#editor').text());"><i class='glyphicon glyphicon-fire'></i></a>
6464
</div>
6565
</div>
66-
<div id="editor" class="lead" placeholder="This is a basic example with a simple toolbar."></div>
66+
<div id="editor" class="lead" data-placeholder="This is a basic example with a simple toolbar."></div>
6767
<div id="editorPreview"></div>
6868
<p style="text-align: center;">
6969
<a class="btn btn-large btn-default jumbo" href="#!" onClick="$('#editorPreview').html($('#editor').html());">Submit</a>
7070
</p>
7171
</div>
7272

7373
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
74-
<script src="../external/jquery.hotkeys.js"></script>
74+
<script src="../bower_components/jquery.hotkeys/jquery.hotkeys.js"></script>
7575
<script src="http://netdna.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script>
76-
<script src="../external/google-code-prettify/prettify.js"></script>
76+
<script src="../bower_components/google-code-prettify/src/prettify.js"></script>
7777
<script src="../src/bootstrap-wysiwyg.js"></script>
7878
<script type='text/javascript'>$('#editor').wysiwyg();</script>
7979
</body>

‎examples/events.html

+12-13
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<meta http-equiv="X-UA-Compatible" content="IE=edge">
66
<meta name="viewport" content="width=device-width, initial-scale=1">
77
<title>A tiny, opensource, Bootstrap WYSIWYG rich text editor</title>
8-
<link href="../external/google-code-prettify/prettify.css" rel="stylesheet" />
8+
<link href="../bower_components/google-code-prettify/src/prettify.css" rel="stylesheet" />
99
<link rel="stylesheet" href="http://netdna.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css" />
1010
<link href="http://netdna.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.css" rel="stylesheet" />
1111
<link href="../css/style.css" rel="stylesheet" />
@@ -18,11 +18,11 @@ <h1>Type something to see events</h1>
1818
<div class="btn-toolbar" data-role="editor-toolbar"
1919
data-target="#editor">
2020
<div class="btn-group">
21-
<a class="btn btn-default dropdown-toggle" data-toggle="dropdown" title="Font Size"><i class="fa fa-text-height"></i>&nbsp;<bclass="caret"></b></a>
21+
<a class="btn btn-default dropdown-toggle" data-toggle="dropdown" title="Font Size"><i class="fa fa-text-height"></i>&nbsp;<b class="caret"></b></a>
2222
<ul class="dropdown-menu">
23-
<li><a data-edit="fontSize 5"><font size="5">Huge</font></a></li>
24-
<li><a data-edit="fontSize 3"><font size="3">Normal</font></a></li>
25-
<li><a data-edit="fontSize 1"><font size="1">Small</font></a></li>
23+
<li><a data-edit="fontSize 5" class="fs-Five">Huge</a></li>
24+
<li><a data-edit="fontSize 3" class="fs-Three">Normal</a></li>
25+
<li><a data-edit="fontSize 1" class="fs-One">Small</a></li>
2626
</ul>
2727
</div>
2828
<div class="btn-group">
@@ -34,7 +34,7 @@ <h1>Type something to see events</h1>
3434
<div class="btn-group">
3535
<a class="btn btn-default" data-edit="insertunorderedlist" title="Bullet list"><i class="fa fa-list-ul"></i></a>
3636
<a class="btn btn-default" data-edit="insertorderedlist" title="Number list"><i class="fa fa-list-ol"></i></a>
37-
<a class="btn btn-default" data-edit="outdent"title="Reduce indent (Shift+Tab)"><i class="fa fa-outdent"></i></a>
37+
<a class="btn btn-default" data-edit="outdent" title="Reduce indent (Shift+Tab)"><i class="fa fa-outdent"></i></a>
3838
<a class="btn btn-default" data-edit="indent" title="Indent (Tab)"><i class="fa fa-indent"></i></a>
3939
</div>
4040
<div class="btn-group">
@@ -46,33 +46,32 @@ <h1>Type something to see events</h1>
4646
<div class="btn-group">
4747
<a class="btn btn-default dropdown-toggle" data-toggle="dropdown" title="Hyperlink"><i class="fa fa-link"></i></a>
4848
<div class="dropdown-menu input-append">
49-
<input class="col-md-2" placeholder="URL" type="text" data-edit="createLink" />
49+
<input placeholder="URL" type="text" data-edit="createLink" />
5050
<button class="btn" type="button">Add</button>
5151
</div>
5252
</div>
53-
5453
<div class="btn-group">
5554
<a class="btn btn-default" data-edit="unlink" title="Remove Hyperlink"><i class="fa fa-unlink"></i></a>
56-
<a class="btn btn-default" title="Insert picture (or just drag & drop)" id="pictureBtn">
55+
<span class="btn btn-default" title="Insert picture (or just drag & drop)" id="pictureBtn">
5756
<i class="fa fa-picture-o"></i> <input type="file" data-role="magic-overlay" data-target="#pictureBtn" data-edit="insertImage" />
58-
</a>
57+
</span>
5958
</div>
6059
<div class="btn-group">
6160
<a class="btn btn-default" data-edit="undo" title="Undo (Ctrl/Cmd+Z)"><i class="fa fa-undo"></i></a>
6261
<a class="btn btn-default" data-edit="redo" title="Redo (Ctrl/Cmd+Y)"><i class="fa fa-repeat"></i></a>
6362
</div>
6463
</div>
65-
<div id="editor" class="lead" placeholder="This is a basic example with no toolbars."></div>
64+
<div id="editor" class="lead" data-placeholder="This is a basic example with no toolbars."></div>
6665
<h2>Live Preview</h2>
6766
<div id="editorPreview"></div>
6867
<h2>Events fired:</h2>
6968
<p id="events_log"></p>
7069
</div>
7170

7271
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
73-
<script src="../external/jquery.hotkeys.js"></script>
72+
<script src="../bower_components/jquery.hotkeys/jquery.hotkeys.js"></script>
7473
<script src="http://netdna.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script>
75-
<script src="../external/google-code-prettify/prettify.js"></script>
74+
<script src="../bower_components/google-code-prettify/src/prettify.js"></script>
7675
<script src="../src/bootstrap-wysiwyg.js"></script>
7776
<script type='text/javascript'>
7877
$('#editor').wysiwyg().on('change', function()

‎examples/form-post.html

+13-16
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<meta http-equiv="X-UA-Compatible" content="IE=edge">
66
<meta name="viewport" content="width=device-width, initial-scale=1">
77
<title>A tiny, opensource, Bootstrap WYSIWYG rich text editor</title>
8-
<link href="../external/google-code-prettify/prettify.css" rel="stylesheet" />
8+
<link href="../bower_components/google-code-prettify/src/prettify.css" rel="stylesheet" />
99
<link rel="stylesheet" href="http://netdna.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css" />
1010
<link href="http://netdna.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.css" rel="stylesheet" />
1111
<link href="../css/style.css" rel="stylesheet" />
@@ -20,9 +20,9 @@ <h1>Simple HTML Editor</h1>
2020
<div class="btn-group">
2121
<a class="btn btn-default dropdown-toggle" data-toggle="dropdown" title="Font Size"><i class="fa fa-text-height"></i>&nbsp;<b class="caret"></b></a>
2222
<ul class="dropdown-menu">
23-
<li><a data-edit="fontSize 5"><font size="5">Huge</font></a></li>
24-
<li><a data-edit="fontSize 3"><font size="3">Normal</font></a></li>
25-
<li><a data-edit="fontSize 1"><font size="1">Small</font></a></li>
23+
<li><a data-edit="fontSize 5" class="fs-Five">Huge</a></li>
24+
<li><a data-edit="fontSize 3" class="fs-Three">Normal</a></li>
25+
<li><a data-edit="fontSize 1" class="fs-One">Small</a></li>
2626
</ul>
2727
</div>
2828
<div class="btn-group">
@@ -46,16 +46,16 @@ <h1>Simple HTML Editor</h1>
4646
<div class="btn-group">
4747
<a class="btn btn-default dropdown-toggle" data-toggle="dropdown" title="Hyperlink"><i class="fa fa-link"></i></a>
4848
<div class="dropdown-menu input-append">
49-
<input class="col-md-2" placeholder="URL" type="text" data-edit="createLink" />
49+
<input placeholder="URL" type="text" data-edit="createLink" />
5050
<button class="btn" type="button">Add</button>
5151
</div>
5252
</div>
53-
5453
<div class="btn-group">
5554
<a class="btn btn-default" data-edit="unlink" title="Remove Hyperlink"><i class="fa fa-unlink"></i></a>
56-
<a class="btn btn-default" title="Insert picture (or just drag & drop)" id="pictureBtn">
57-
<i class="fa fa-picture-o"></i> <input type="file" data-role="magic-overlay" data-target="#pictureBtn" data-edit="insertImage" />
58-
</a>
55+
<span class="btn btn-default" title="Insert picture (or just drag & drop)" id="pictureBtn">
56+
<i class="fa fa-picture-o"></i>
57+
<input type="file" data-role="magic-overlay" data-target="#pictureBtn" data-edit="insertImage" />
58+
</span>
5959
</div>
6060
<div class="btn-group">
6161
<a class="btn btn-default" data-edit="undo" title="Undo (Ctrl/Cmd+Z)"><i class="fa fa-undo"></i></a>
@@ -66,19 +66,16 @@ <h1>Simple HTML Editor</h1>
6666
<div id="editorPreview"></div>
6767

6868
<form action="php/upload.php" method="post" enctype="multipart/form-data" id='submitForm'>
69-
<p style="text-align: center;">
70-
<div id="editor" class="lead" placeholder="This is a basic example with a simple toolbar."></div>
71-
<a class="btn btn-large btn-default jumbo"
72-
href="#!" onClick="$('#mySubmission').val($('#editor').cleanHtml(true));$('#submitForm').submit();">Submit</a>
73-
</p>
69+
<div id="editor" class="lead" data-placeholder="This is a basic example with a simple toolbar."></div>
70+
<a class="btn btn-large btn-default jumbo" href="#!" onClick="$('#mySubmission').val($('#editor').cleanHtml(true));$('#submitForm').submit();">Submit</a>
7471
<input type='hidden' name='formSubmission' id='mySubmission'/>
7572
</form>
7673
</div>
7774

7875
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
79-
<script src="../external/jquery.hotkeys.js"></script>
76+
<script src="../bower_components/jquery.hotkeys/jquery.hotkeys.js"></script>
8077
<script src="http://netdna.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script>
81-
<script src="../external/google-code-prettify/prettify.js"></script>
78+
<script src="../bower_components/google-code-prettify/src/prettify.js"></script>
8279
<script src="../src/bootstrap-wysiwyg.js"></script>
8380
<script type='text/javascript'>$('#editor').wysiwyg(
8481
{

‎examples/formatblock-example.html

+10-10
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<meta http-equiv="X-UA-Compatible" content="IE=edge">
66
<meta name="viewport" content="width=device-width, initial-scale=1">
77
<title>A tiny, opensource, Bootstrap WYSIWYG rich text editor</title>
8-
<link href="../external/google-code-prettify/prettify.css" rel="stylesheet" />
8+
<link href="../bower_components/google-code-prettify/src/prettify.css" rel="stylesheet" />
99
<link rel="stylesheet" href="http://netdna.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css" />
1010
<link href="http://netdna.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.css" rel="stylesheet" />
1111
<link href="../css/style.css" rel="stylesheet" />
@@ -20,9 +20,9 @@ <h1>Simple HTML Editor</h1>
2020
<div class="btn-group">
2121
<a class="btn btn-default dropdown-toggle" data-toggle="dropdown" title="Font Size"><i class="fa fa-text-height"></i>&nbsp;<b class="caret"></b></a>
2222
<ul class="dropdown-menu">
23-
<li><a data-edit="fontSize 5"><font size="5">Huge</font></a></li>
24-
<li><a data-edit="fontSize 3"><font size="3">Normal</font></a></li>
25-
<li><a data-edit="fontSize 1"><font size="1">Small</font></a></li>
23+
<li><a data-edit="fontSize 5" class="fs-Five">Huge</a></li>
24+
<li><a data-edit="fontSize 3" class="fs-Three">Normal</a></li>
25+
<li><a data-edit="fontSize 1" class="fs-One">Small</a></li>
2626
</ul>
2727
</div>
2828
<div class="btn-group">
@@ -58,33 +58,33 @@ <h1>Simple HTML Editor</h1>
5858
<div class="btn-group">
5959
<a class="btn btn-default dropdown-toggle" data-toggle="dropdown" title="Hyperlink"><i class="fa fa-link"></i></a>
6060
<div class="dropdown-menu input-append">
61-
<input class="col-md-2" placeholder="URL" type="text" data-edit="createLink" />
61+
<input placeholder="URL" type="text" data-edit="createLink" />
6262
<button class="btn" type="button">Add</button>
6363
</div>
6464
</div>
6565
<div class="btn-group">
6666
<a class="btn btn-default" data-edit="unlink" title="Remove Hyperlink"><i class="fa fa-unlink"></i></a>
67-
<a class="btn btn-default" title="Insert picture (or just drag & drop)" id="pictureBtn">
67+
<span class="btn btn-default" title="Insert picture (or just drag & drop)" id="pictureBtn">
6868
<i class="fa fa-picture-o"></i> <input type="file" data-role="magic-overlay" data-target="#pictureBtn" data-edit="insertImage" />
69-
</a>
69+
</span>
7070
</div>
7171
<div class="btn-group">
7272
<a class="btn btn-default" data-edit="undo" title="Undo (Ctrl/Cmd+Z)"><i class="fa fa-undo"></i></a>
7373
<a class="btn btn-default" data-edit="redo" title="Redo (Ctrl/Cmd+Y)"><i class="fa fa-repeat"></i></a>
7474
<a class="btn btn-default" data-edit="html" title="Clear Formatting"><i class='glyphicon glyphicon-pencil'></i></a>
7575
</div>
7676
</div>
77-
<div id="editor" class="lead" placeholder="This is a basic example with a simple toolbar."></div>
77+
<div id="editor" class="lead" data-placeholder="This is a basic example with a simple toolbar."></div>
7878
<div id="editorPreview"></div>
7979
<p style="text-align: center;">
8080
<a class="btn btn-large btn-default jumbo" href="#!" onClick="$('#editorPreview').html($('#editor').html());">Submit</a>
8181
</p>
8282
</div>
8383

8484
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
85-
<script src="../external/jquery.hotkeys.js"></script>
85+
<script src="../bower_components/jquery.hotkeys/jquery.hotkeys.js"></script>
8686
<script src="http://netdna.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script>
87-
<script src="../external/google-code-prettify/prettify.js"></script>
87+
<script src="../bower_components/google-code-prettify/src/prettify.js"></script>
8888
<script src="../src/bootstrap-wysiwyg.js"></script>
8989
<script type='text/javascript'>$('#editor').wysiwyg();</script>
9090
</body>

0 commit comments

Comments
 (0)