wysihtml5x-rails 0.4.11 → 0.4.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b947a36a20f9fb548d69f5d19a3d3598764c897c
-  data.tar.gz: beea337fa9d8a0fab17c87456c8b9d508545e8e8
+  metadata.gz: 1907d5edb4a6bbbdf40f6d95e5b8bb0a8fd16769
+  data.tar.gz: 3f18eb241af83236b88cf71f83c58cb623a32063
 SHA512:
-  metadata.gz: 9b730a0844fc040d82807bff6b7f16ce8cb4d0af011de4b204e010f993a6a519cd0268f5e225d82277700a981d7712edc3c7c0e6a022adfa5340d084e6f60e51
-  data.tar.gz: 3d20acf3e2991c32e150a20a0db8c12b3a5ebe971753c6de618792933d50b5bbc941fe1e967ced1625abcff650222ed7e14bfb8d048f691a932b1e2bdf2d879e
+  metadata.gz: 5d5e5b649260f6c3848bd34c55dfbda1ba7562fe4e8b2d16cd796b58b0110f91c92290965d86e3dbeaeb8f1bf8aaefa76540c5bedf3611b7dd4eada9c28b3143
+  data.tar.gz: 5b2383c3215776c3412defa93781c037a31814828c684cc9536eca3dc516b2aa3d06c365fbdf32e18f850819c4405d233b1d7ac9e7a6ca0011b5dc54a0972620

data/lib/wysihtml5x/rails/version.rb

@@ -1,5 +1,5 @@
 module Wysihtml5x
   module Rails
-    VERSION = "0.4.11"
+    VERSION = "0.4.12"
   end
 end

data/vendor/assets/javascripts/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>"     ||

data/vendor/assets/javascripts/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>"     ||

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wysihtml5x-rails
 version: !ruby/object:Gem::Version
-  version: 0.4.11
+  version: 0.4.12
 platform: ruby
 authors:
 - Tanel Jakobsoo