Summer update

Voog · Jul 3, 2014 · 7d97559 · 7d97559
1 parent 809aa55
commit 7d97559
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 16 deletions.
diff --git a/CHANGELOG.textile b/CHANGELOG.textile
@@ -1,3 +1,7 @@
+*wysihtml5x 0.4.11* (July 03, 2014)
+* Tests are now made with up to date Qunit (tanks @Waxolunist)
+* Fixes an error that placeholder will not be displayed when whitespace present in editor
+
 *wysihtml5x 0.4.10* (June 27, 2014)
 * Solve inline formating issues when applying multiple styles
 * Add a special case when deleting into heading with caret

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "wysihtml5x",
-  "version": "0.4.10",
+  "version": "0.4.11",
   "main": [
     "dist/wysihtml5x.min.js",
     "dist/wysihtml5x-toolbar.min.js"

diff --git a/dist/wysihtml5x-toolbar.js b/dist/wysihtml5x-toolbar.js
@@ -25,7 +25,7 @@ if(!Array.isArray) {
     return Object.prototype.toString.call(arg) === '[object Array]';
   };
 };/**
- * @license wysihtml5x v0.4.10
+ * @license wysihtml5x v0.4.11
  * https://github.com/Edicy/wysihtml5
  *
  * Author: Christopher Blum (https://github.com/tiff)
@@ -36,7 +36,7 @@ if(!Array.isArray) {
  *
  */
 var wysihtml5 = {
-  version: "0.4.10",
+  version: "0.4.11",
 
   // namespaces
   commands:   {},
@@ -11845,7 +11845,8 @@ wysihtml5.views.View = Base.extend(
 
     isEmpty: function() {
       var innerHTML = this.element.innerHTML.toLowerCase();
-      return innerHTML === ""            ||
+      return (/^\s*$/i).test(innerHTML)  ||
+             innerHTML === ""            ||
              innerHTML === "<br>"        ||
              innerHTML === "<p></p>"     ||
              innerHTML === "<p><br></p>" ||

diff --git a/dist/wysihtml5x-toolbar.min.js b/dist/wysihtml5x-toolbar.min.js
diff --git a/dist/wysihtml5x-toolbar.min.map b/dist/wysihtml5x-toolbar.min.map
diff --git a/dist/wysihtml5x.js b/dist/wysihtml5x.js
@@ -25,7 +25,7 @@ if(!Array.isArray) {
     return Object.prototype.toString.call(arg) === '[object Array]';
   };
 };/**
- * @license wysihtml5x v0.4.10
+ * @license wysihtml5x v0.4.11
  * https://github.com/Edicy/wysihtml5
  *
  * Author: Christopher Blum (https://github.com/tiff)
@@ -36,7 +36,7 @@ if(!Array.isArray) {
  *
  */
 var wysihtml5 = {
-  version: "0.4.10",
+  version: "0.4.11",
 
   // namespaces
   commands:   {},
@@ -11845,7 +11845,8 @@ wysihtml5.views.View = Base.extend(
 
     isEmpty: function() {
       var innerHTML = this.element.innerHTML.toLowerCase();
-      return innerHTML === ""            ||
+      return (/^\s*$/i).test(innerHTML)  ||
+             innerHTML === ""            ||
              innerHTML === "<br>"        ||
              innerHTML === "<p></p>"     ||
              innerHTML === "<p><br></p>" ||

diff --git a/dist/wysihtml5x.min.js b/dist/wysihtml5x.min.js
diff --git a/dist/wysihtml5x.min.map b/dist/wysihtml5x.min.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wysihtml5x",
-  "version": "0.4.10",
+  "version": "0.4.11",
   "devDependencies": {
     "grunt": "~0.4.4",
     "grunt-contrib-concat": "~0.4.0",