wysihtml-rails 0.5.0.beta10 → 0.5.0.beta11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81549cbb9a36c9d74e052ce4fb1ca5c0b232daa6
-  data.tar.gz: 0cb8580a29fa4667a6afc9068f8839138a8612f0
+  metadata.gz: 8a424f7a7451c2ed2ee295f44fd26f3b8e50cad5
+  data.tar.gz: 699e6c52b926edc5bf8ac1eb437018af88d6cf62
 SHA512:
-  metadata.gz: 5ed9c1cadd3b1e82d0bed2bb8d30c54f943193ad80aa96ec79efd3292dd94f3740dae8da8e512daf1f36c28100c81aceb09ac6b6dd85dd74789f7e500221f022
-  data.tar.gz: 3d4c341657f1be7211eedcb52b0bce809b495e328b460ac46f6fa14cb57572958b65bd7d43f5c0fe33d05f1a855f1637cc882f2e88b43eb7521b21068769e4bc
+  metadata.gz: cb041671d6dbfe31ae9d63dfd177dd1d68a034d9ff2725cba285d80f06901395bea1845d5610fe4a08e004c68f482440346a867ef600febbc2cee0f96a2e0634
+  data.tar.gz: 0b1f3ca29b5e4f6466df2d59084c6b7f35a2e6c4a03714a1df865eea1084b31190858800d98d5c43e6e9533da5274b50b30255b977ca7da7edc20c3bb56e63a2

data/lib/wysihtml/rails/version.rb

@@ -1,5 +1,5 @@
 module Wysihtml
   module Rails
-    VERSION = "0.5.0.beta10"
+    VERSION = "0.5.0.beta11"
   end
 end

data/vendor/assets/javascripts/wysihtml-toolbar.js

@@ -1,5 +1,5 @@
 /**
- * @license wysihtml v0.5.0-beta10
+ * @license wysihtml v0.5.0-beta11
  * https://github.com/Voog/wysihtml
  *
  * Author: Christopher Blum (https://github.com/tiff)
@@ -10,7 +10,7 @@
  *
  */
 var wysihtml5 = {
-  version: "0.5.0-beta10",
+  version: "0.5.0-beta11",
 
   // namespaces
   commands:   {},
@@ -388,6 +388,7 @@ var wysihtml5 = {
 
       ret = (e.childNodes.length !== 1 || s.anchorNode !== e.firstChild || s.anchorOffset !== 2);
       e.parentNode.removeChild(e);
+      s.removeAllRanges();
       return ret;
     }
   };
@@ -5073,7 +5074,7 @@ wysihtml5.browser = (function() {
       It is on window but cannot return text/html
       Should actually check for clipboardData on paste event, but cannot in firefox
     */
-    supportsModenPaste: function () {
+    supportsModernPaste: function () {
       return !("clipboardData" in window);
     },
 
@@ -10044,7 +10045,15 @@ wysihtml5.quirks.ensureProperClearing = (function() {
 
           if (includePrevLeaves) {
             var prevNode = this.getPreviousNode(startNode, true),
-              prevLeaf = prevNode ? wysihtml5.dom.domNode(prevNode).lastLeafNode() : null;
+                prevLeaf = null;
+
+            if(prevNode) {
+              if (prevNode.nodeType === 1 && wysihtml5.dom.hasClass(prevNode, this.unselectableClass)) {
+                prevLeaf = prevNode;
+              } else {
+                prevLeaf = wysihtml5.dom.domNode(prevNode).lastLeafNode();
+              }
+            }
 
             if (prevLeaf) {
               return {
@@ -15394,7 +15403,7 @@ wysihtml5.views.View = Base.extend(
       var oldHtml,
           cleanHtml;
 
-      if (wysihtml5.browser.supportsModenPaste()) {
+      if (wysihtml5.browser.supportsModernPaste()) {
         this.on("paste:composer", function(event) {
           event.preventDefault();
           oldHtml = wysihtml5.dom.getPastedHtml(event);

data/vendor/assets/javascripts/wysihtml.js

@@ -1,5 +1,5 @@
 /**
- * @license wysihtml v0.5.0-beta10
+ * @license wysihtml v0.5.0-beta11
  * https://github.com/Voog/wysihtml
  *
  * Author: Christopher Blum (https://github.com/tiff)
@@ -10,7 +10,7 @@
  *
  */
 var wysihtml5 = {
-  version: "0.5.0-beta10",
+  version: "0.5.0-beta11",
 
   // namespaces
   commands:   {},
@@ -388,6 +388,7 @@ var wysihtml5 = {
 
       ret = (e.childNodes.length !== 1 || s.anchorNode !== e.firstChild || s.anchorOffset !== 2);
       e.parentNode.removeChild(e);
+      s.removeAllRanges();
       return ret;
     }
   };
@@ -5073,7 +5074,7 @@ wysihtml5.browser = (function() {
       It is on window but cannot return text/html
       Should actually check for clipboardData on paste event, but cannot in firefox
     */
-    supportsModenPaste: function () {
+    supportsModernPaste: function () {
       return !("clipboardData" in window);
     },
 
@@ -10044,7 +10045,15 @@ wysihtml5.quirks.ensureProperClearing = (function() {
 
           if (includePrevLeaves) {
             var prevNode = this.getPreviousNode(startNode, true),
-              prevLeaf = prevNode ? wysihtml5.dom.domNode(prevNode).lastLeafNode() : null;
+                prevLeaf = null;
+
+            if(prevNode) {
+              if (prevNode.nodeType === 1 && wysihtml5.dom.hasClass(prevNode, this.unselectableClass)) {
+                prevLeaf = prevNode;
+              } else {
+                prevLeaf = wysihtml5.dom.domNode(prevNode).lastLeafNode();
+              }
+            }
 
             if (prevLeaf) {
               return {
@@ -15394,7 +15403,7 @@ wysihtml5.views.View = Base.extend(
       var oldHtml,
           cleanHtml;
 
-      if (wysihtml5.browser.supportsModenPaste()) {
+      if (wysihtml5.browser.supportsModernPaste()) {
         this.on("paste:composer", function(event) {
           event.preventDefault();
           oldHtml = wysihtml5.dom.getPastedHtml(event);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wysihtml-rails
 version: !ruby/object:Gem::Version
-  version: 0.5.0.beta10
+  version: 0.5.0.beta11
 platform: ruby
 authors:
 - Tanel Jakobsoo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-04 00:00:00.000000000 Z
+date: 2015-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties