From 81d7fd3aeff393924a2d12ceeb090355ef9321ad Mon Sep 17 00:00:00 2001 From: Steve King Date: Mon, 28 Apr 2014 17:12:30 +1000 Subject: [PATCH] * 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) --- CHANGES | 14 +- bower.json | 2 +- index.css => css/style.css | 10 ++ examples/basic.html | 38 ++++++ examples/clear-formatting.html | 124 ++++++++++++++++++ examples/simple-toolbar.html | 119 +++++++++++++++++ index.html | 8 +- .../bootstrap-wysiwyg.min.js | 0 .../bootstrap-wysiwyg.js | 0 9 files changed, 307 insertions(+), 8 deletions(-) rename index.css => css/style.css (77%) create mode 100644 examples/basic.html create mode 100644 examples/clear-formatting.html create mode 100644 examples/simple-toolbar.html rename bootstrap-wysiwyg.min.js => js/bootstrap-wysiwyg.min.js (100%) rename bootstrap-wysiwyg.js => src/bootstrap-wysiwyg.js (100%) diff --git a/CHANGES b/CHANGES index 2864db0..ed42f6a 100644 --- a/CHANGES +++ b/CHANGES @@ -1,10 +1,22 @@ +1.0.2 - Merged some extras + +* 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.0.1 - Released to the universe * General improvements and fixes (see graph) * Merged a number of wild forks in * Fixed issue #23 (NS_ERROR_UNEXPECTED) by @jordandh * Fixed issue #118 (Format block buttons) by @beatnbite -* Multiple instances support by @brutuscat +* Multiple instances support by @brutuscat as per request #140 * Fix range selection in IE8 by @tilleryd * Added throttle to update to improve performance on old browsers by @VictorBjelkholm * UglifyJS Version of the code (bootstrap-wysiwyg.min.js) diff --git a/bower.json b/bower.json index e27bb50..cde0e12 100644 --- a/bower.json +++ b/bower.json @@ -1,7 +1,7 @@ { "name": "bootstrap-wysiwyg", "description": "Tiny Bootstrap and JQuery Based WISWYG rich text editor based on browser execCommand.", - "version": "1.0.1", + "version": "1.0.2", "keywords": [ "css", "js", diff --git a/index.css b/css/style.css similarity index 77% rename from index.css rename to css/style.css index f1f6663..bc95c23 100644 --- a/index.css +++ b/css/style.css @@ -2,6 +2,7 @@ * of the key things about the widget is that it allows you to do your own styling! */ + #editor { max-height: 250px; height: 250px; @@ -17,6 +18,15 @@ overflow: scroll; outline: none; } +#editor:focus{ + border-color:rgba(82, 168, 236, 0.8); + outline:0; + outline:thin dotted \9; + -webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); + -moz-box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); + box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); +} + #voiceBtn { width: 20px; color: transparent; diff --git a/examples/basic.html b/examples/basic.html new file mode 100644 index 0000000..8f2e1a2 --- /dev/null +++ b/examples/basic.html @@ -0,0 +1,38 @@ + + + + + Tiny, opensource, Bootstrap WYSIWYG rich text editor + + + + + + + + + + + + + + + + +
+

Basic editor, no fancy bits.

+
+
+

+ Submit +

+
+ + + \ No newline at end of file diff --git a/examples/clear-formatting.html b/examples/clear-formatting.html new file mode 100644 index 0000000..09b2cd5 --- /dev/null +++ b/examples/clear-formatting.html @@ -0,0 +1,124 @@ + + + + + Tiny, opensource, Bootstrap WYSIWYG rich text editor + + + + + + + + + + + + + + + + +
+ +

Simple Editor with Toolbar

+
+
+   + + +
+
+ + + + + +
+
+ + + + + +
+
+ + + + + +
+
+ + +
+ + +
+
+ +
+ + + +
+
+ + + + + + + +
+
+
+
+

+ Submit +

+
+ + + \ No newline at end of file diff --git a/examples/simple-toolbar.html b/examples/simple-toolbar.html new file mode 100644 index 0000000..578fa4a --- /dev/null +++ b/examples/simple-toolbar.html @@ -0,0 +1,119 @@ + + + + + Tiny, opensource, Bootstrap WYSIWYG rich text editor + + + + + + + + + + + + + + + + +
+ +

Simple Editor with Toolbar

+
+
+   + + +
+
+ + + + + +
+
+ + + + + +
+
+ + + + + +
+
+ + +
+ + +
+
+ +
+ + + +
+
+ + + +
+
+
+
+

+ Submit +

+
+ + + \ No newline at end of file diff --git a/index.html b/index.html index 394d094..368521c 100644 --- a/index.html +++ b/index.html @@ -9,10 +9,6 @@ content="opensource rich wysiwyg text editor jquery bootstrap execCommand html5" /> - - @@ -25,8 +21,8 @@ - - + + diff --git a/bootstrap-wysiwyg.min.js b/js/bootstrap-wysiwyg.min.js similarity index 100% rename from bootstrap-wysiwyg.min.js rename to js/bootstrap-wysiwyg.min.js diff --git a/bootstrap-wysiwyg.js b/src/bootstrap-wysiwyg.js similarity index 100% rename from bootstrap-wysiwyg.js rename to src/bootstrap-wysiwyg.js