Update version again

CHANGELOG.textile

@@ -1,3 +1,6 @@
+*wysihtml5x 0.4.12* (July 03, 2014)
+* Fixes some placeholder problems targeting Firefox and Safari.
+
 *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

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "wysihtml5x",
-  "version": "0.4.11",
+  "version": "0.4.12",
   "main": [
     "dist/wysihtml5x.min.js",
     "dist/wysihtml5x-toolbar.min.js"

dist/wysihtml5x-toolbar.js

@@ -25,7 +25,7 @@ if(!Array.isArray) {
     return Object.prototype.toString.call(arg) === '[object Array]';
   };
 };/**
- * @license wysihtml5x v0.4.11
+ * @license wysihtml5x v0.4.12
  * https://github.com/Edicy/wysihtml5
  *
  * Author: Christopher Blum (https://github.com/tiff)
@@ -36,7 +36,7 @@ if(!Array.isArray) {
  *
  */
 var wysihtml5 = {
-  version: "0.4.11",
+  version: "0.4.12",
 
   // namespaces
   commands:   {},
@@ -7046,6 +7046,13 @@ wysihtml5.dom.replaceWithChildNodes = function(node) {
         unset = function() {
           if (view.hasPlaceholderSet()) {
             view.clear();
+            view.element.focus();
+            setTimeout(function() {
+              var sel = view.selection.getSelection();
+              if (!sel.focusNode || !sel.anchorNode) {
+                view.selection.selectNode(view.element.firstChild || view.element);
+              }
+            }, 0);
           }
           view.placeholderSet = false;
           dom.removeClass(view.element, CLASS_NAME);
@@ -11845,7 +11852,7 @@ wysihtml5.views.View = Base.extend(
 
     isEmpty: function() {
       var innerHTML = this.element.innerHTML.toLowerCase();
-      return (/^\s*$/i).test(innerHTML)  ||
+      return (/^(\s|<br>|<\/br>|<p>|<\/p>)*$/i).test(innerHTML)  ||
              innerHTML === ""            ||
              innerHTML === "<br>"        ||
              innerHTML === "<p></p>"     ||

dist/wysihtml5x.js

@@ -25,7 +25,7 @@ if(!Array.isArray) {
     return Object.prototype.toString.call(arg) === '[object Array]';
   };
 };/**
- * @license wysihtml5x v0.4.11
+ * @license wysihtml5x v0.4.12
  * https://github.com/Edicy/wysihtml5
  *
  * Author: Christopher Blum (https://github.com/tiff)
@@ -36,7 +36,7 @@ if(!Array.isArray) {
  *
  */
 var wysihtml5 = {
-  version: "0.4.11",
+  version: "0.4.12",
 
   // namespaces
   commands:   {},
@@ -7046,6 +7046,13 @@ wysihtml5.dom.replaceWithChildNodes = function(node) {
         unset = function() {
           if (view.hasPlaceholderSet()) {
             view.clear();
+            view.element.focus();
+            setTimeout(function() {
+              var sel = view.selection.getSelection();
+              if (!sel.focusNode || !sel.anchorNode) {
+                view.selection.selectNode(view.element.firstChild || view.element);
+              }
+            }, 0);
           }
           view.placeholderSet = false;
           dom.removeClass(view.element, CLASS_NAME);
@@ -11845,7 +11852,7 @@ wysihtml5.views.View = Base.extend(
 
     isEmpty: function() {
       var innerHTML = this.element.innerHTML.toLowerCase();
-      return (/^\s*$/i).test(innerHTML)  ||
+      return (/^(\s|<br>|<\/br>|<p>|<\/p>)*$/i).test(innerHTML)  ||
              innerHTML === ""            ||
              innerHTML === "<br>"        ||
              innerHTML === "<p></p>"     ||

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wysihtml5x",
-  "version": "0.4.11",
+  "version": "0.4.12",
   "devDependencies": {
     "grunt": "~0.4.4",
     "grunt-contrib-concat": "~0.4.0",