wysihtml-rails 0.5.0.beta2 → 0.5.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 267eee793c065a025baf524f402e873eef5cae91
-  data.tar.gz: eb78cce4979a2cb6bcb168c101896d5e6601eaa1
+  metadata.gz: 80fb7a97bd3a8949601d855eb648fe70e04fb780
+  data.tar.gz: 7e3e5d9f5c94a4baf89d7f4194712475f34750db
 SHA512:
-  metadata.gz: f9913fd89e5135d18bfcc84c6e01e24d2caf0958c423eac23aa1b862c4eaf4327ef4c7a1c476d5be0ae35780062deb5bcb9ecad2e8945c139079298c6b0842ea
-  data.tar.gz: d9ac39c4a3a64b6dd779e943472439239afd73789de27acb936d029063a515c90aa01a7aee252c05c1f181082b645e03bb9d406982b53c7047dc32380c84eb10
+  metadata.gz: cf951f10fe24d21b4d61cd2fa1fc28c8c4e0090ab4fb72a13552e52c085ffc43a0b59a5b3a388226420702af3a97de074ee7ba1e51ad324ec0b6a062ff2480fc
+  data.tar.gz: 53662b435dd43a8a704fdc209f7ddd4aa8fbca1025768387e26aef6ef9b7d2e51bdeef1e506024f5fbb909f4145d8a58623771c2c08a706371280025d12f5a20

data/lib/wysihtml/rails/version.rb

@@ -1,5 +1,5 @@
 module Wysihtml
   module Rails
-    VERSION = "0.5.0.beta2"
+    VERSION = "0.5.0.beta3"
   end
 end

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

@@ -1,7 +1,7 @@
 // TODO: in future try to replace most inline compability checks with polyfills for code readability 
 
 // IE8 SUPPORT BLOCK
-// You can compile wuthout all this if IE8 is not needed
+// You can compile without all this if IE8 is not needed
 
 // String trim for ie8
 if (!String.prototype.trim) {
@@ -321,9 +321,10 @@ if ("document" in self) {
 
     }(self));
 
-  } else {
+  } else if ("DOMTokenList" in window) {
     // There is full or partial native classList support, so just check if we need
     // to normalize the add/remove and toggle APIs.
+    // DOMTokenList is expected to exist (removes conflicts with multiple polyfills present on site)
 
     (function() {
       "use strict";
@@ -376,7 +377,7 @@ if ("document" in self) {
 }
 
 ;/**
- * @license wysihtml5x v0.5.0-beta2
+ * @license wysihtml5x v0.5.0-beta3
  * https://github.com/Edicy/wysihtml5
  *
  * Author: Christopher Blum (https://github.com/tiff)
@@ -387,7 +388,7 @@ if ("document" in self) {
  *
  */
 var wysihtml5 = {
-  version: "0.5.0-beta2",
+  version: "0.5.0-beta3",
 
   // namespaces
   commands:   {},
@@ -9001,22 +9002,20 @@ wysihtml5.quirks.ensureProperClearing = (function() {
             cells: null,
             select: selectCells
         },
-        selection_class = "wysiwyg-tmp-selected-cell",
-        moveHandler = null,
-        upHandler = null;
+        selection_class = "wysiwyg-tmp-selected-cell";
 
     function init () {
-
-        dom.observe(editable, "mousedown", function(event) {
-          var target = wysihtml5.dom.getParentElement(event.target, { query: "td, th" });
-          if (target) {
-              handleSelectionMousedown(target);
-          }
-        });
-
+        editable.addEventListener("mousedown", handleMouseDown);
         return select;
     }
 
+    var handleMouseDown = function(event) {
+      var target = wysihtml5.dom.getParentElement(event.target, { query: "td, th" });
+      if (target) {
+          handleSelectionMousedown(target);
+      }
+    };
+
     function handleSelectionMousedown (target) {
       select.start = target;
       select.end = target;
@@ -9026,8 +9025,8 @@ wysihtml5.quirks.ensureProperClearing = (function() {
       if (select.table) {
         removeCellSelections();
         dom.addClass(target, selection_class);
-        moveHandler = dom.observe(editable, "mousemove", handleMouseMove);
-        upHandler = dom.observe(editable, "mouseup", handleMouseUp);
+        editable.addEventListener("mousemove", handleMouseMove);
+        editable.addEventListener("mouseup", handleMouseUp);
         editor.fire("tableselectstart").fire("tableselectstart:composer");
       }
     }
@@ -9052,7 +9051,7 @@ wysihtml5.quirks.ensureProperClearing = (function() {
 
     function handleMouseMove (event) {
       var curTable = null,
-          cell = dom.getParentElement(event.target, { nodeName: "td, th" }),
+          cell = dom.getParentElement(event.target, { query: "td, th" }),
           oldEnd;
 
       if (cell && select.table && select.start) {
@@ -9074,25 +9073,27 @@ wysihtml5.quirks.ensureProperClearing = (function() {
     }
 
     function handleMouseUp (event) {
-      moveHandler.stop();
-      upHandler.stop();
+      editable.removeEventListener("mousemove", handleMouseMove);
+      editable.removeEventListener("mouseup", handleMouseUp);
       editor.fire("tableselect").fire("tableselect:composer");
       setTimeout(function() {
         bindSideclick();
       },0);
     }
 
+    var sideClickHandler = function(event) {
+      editable.ownerDocument.removeEventListener("click", sideClickHandler);
+      if (dom.getParentElement(event.target, { query: "table" }) != select.table) {
+          removeCellSelections();
+          select.table = null;
+          select.start = null;
+          select.end = null;
+          editor.fire("tableunselect").fire("tableunselect:composer");
+      }
+    };
+
     function bindSideclick () {
-        var sideClickHandler = dom.observe(editable.ownerDocument, "click", function(event) {
-          sideClickHandler.stop();
-          if (dom.getParentElement(event.target, { query: "table" }) != select.table) {
-              removeCellSelections();
-              select.table = null;
-              select.start = null;
-              select.end = null;
-              editor.fire("tableunselect").fire("tableunselect:composer");
-          }
-        });
+      editable.ownerDocument.addEventListener("click", sideClickHandler);
     }
 
     function selectCells (start, end) {
@@ -12965,7 +12966,14 @@ wysihtml5.views.View = Base.extend(
     },
 
     cleanUp: function() {
-        this.parent.parse(this.element);
+      var bookmark;
+      if (this.selection) {
+        bookmark = rangy.saveSelection(this.doc.defaultView || this.doc.parentWindow);
+      }
+      this.parent.parse(this.element);
+      if (bookmark) {
+        rangy.restoreSelection(bookmark);
+      }
     },
 
     show: function() {

data/vendor/assets/javascripts/wysihtml.js

@@ -1,7 +1,7 @@
 // TODO: in future try to replace most inline compability checks with polyfills for code readability 
 
 // IE8 SUPPORT BLOCK
-// You can compile wuthout all this if IE8 is not needed
+// You can compile without all this if IE8 is not needed
 
 // String trim for ie8
 if (!String.prototype.trim) {
@@ -321,9 +321,10 @@ if ("document" in self) {
 
     }(self));
 
-  } else {
+  } else if ("DOMTokenList" in window) {
     // There is full or partial native classList support, so just check if we need
     // to normalize the add/remove and toggle APIs.
+    // DOMTokenList is expected to exist (removes conflicts with multiple polyfills present on site)
 
     (function() {
       "use strict";
@@ -376,7 +377,7 @@ if ("document" in self) {
 }
 
 ;/**
- * @license wysihtml5x v0.5.0-beta2
+ * @license wysihtml5x v0.5.0-beta3
  * https://github.com/Edicy/wysihtml5
  *
  * Author: Christopher Blum (https://github.com/tiff)
@@ -387,7 +388,7 @@ if ("document" in self) {
  *
  */
 var wysihtml5 = {
-  version: "0.5.0-beta2",
+  version: "0.5.0-beta3",
 
   // namespaces
   commands:   {},
@@ -9001,22 +9002,20 @@ wysihtml5.quirks.ensureProperClearing = (function() {
             cells: null,
             select: selectCells
         },
-        selection_class = "wysiwyg-tmp-selected-cell",
-        moveHandler = null,
-        upHandler = null;
+        selection_class = "wysiwyg-tmp-selected-cell";
 
     function init () {
-
-        dom.observe(editable, "mousedown", function(event) {
-          var target = wysihtml5.dom.getParentElement(event.target, { query: "td, th" });
-          if (target) {
-              handleSelectionMousedown(target);
-          }
-        });
-
+        editable.addEventListener("mousedown", handleMouseDown);
         return select;
     }
 
+    var handleMouseDown = function(event) {
+      var target = wysihtml5.dom.getParentElement(event.target, { query: "td, th" });
+      if (target) {
+          handleSelectionMousedown(target);
+      }
+    };
+
     function handleSelectionMousedown (target) {
       select.start = target;
       select.end = target;
@@ -9026,8 +9025,8 @@ wysihtml5.quirks.ensureProperClearing = (function() {
       if (select.table) {
         removeCellSelections();
         dom.addClass(target, selection_class);
-        moveHandler = dom.observe(editable, "mousemove", handleMouseMove);
-        upHandler = dom.observe(editable, "mouseup", handleMouseUp);
+        editable.addEventListener("mousemove", handleMouseMove);
+        editable.addEventListener("mouseup", handleMouseUp);
         editor.fire("tableselectstart").fire("tableselectstart:composer");
       }
     }
@@ -9052,7 +9051,7 @@ wysihtml5.quirks.ensureProperClearing = (function() {
 
     function handleMouseMove (event) {
       var curTable = null,
-          cell = dom.getParentElement(event.target, { nodeName: "td, th" }),
+          cell = dom.getParentElement(event.target, { query: "td, th" }),
           oldEnd;
 
       if (cell && select.table && select.start) {
@@ -9074,25 +9073,27 @@ wysihtml5.quirks.ensureProperClearing = (function() {
     }
 
     function handleMouseUp (event) {
-      moveHandler.stop();
-      upHandler.stop();
+      editable.removeEventListener("mousemove", handleMouseMove);
+      editable.removeEventListener("mouseup", handleMouseUp);
       editor.fire("tableselect").fire("tableselect:composer");
       setTimeout(function() {
         bindSideclick();
       },0);
     }
 
+    var sideClickHandler = function(event) {
+      editable.ownerDocument.removeEventListener("click", sideClickHandler);
+      if (dom.getParentElement(event.target, { query: "table" }) != select.table) {
+          removeCellSelections();
+          select.table = null;
+          select.start = null;
+          select.end = null;
+          editor.fire("tableunselect").fire("tableunselect:composer");
+      }
+    };
+
     function bindSideclick () {
-        var sideClickHandler = dom.observe(editable.ownerDocument, "click", function(event) {
-          sideClickHandler.stop();
-          if (dom.getParentElement(event.target, { query: "table" }) != select.table) {
-              removeCellSelections();
-              select.table = null;
-              select.start = null;
-              select.end = null;
-              editor.fire("tableunselect").fire("tableunselect:composer");
-          }
-        });
+      editable.ownerDocument.addEventListener("click", sideClickHandler);
     }
 
     function selectCells (start, end) {
@@ -12965,7 +12966,14 @@ wysihtml5.views.View = Base.extend(
     },
 
     cleanUp: function() {
-        this.parent.parse(this.element);
+      var bookmark;
+      if (this.selection) {
+        bookmark = rangy.saveSelection(this.doc.defaultView || this.doc.parentWindow);
+      }
+      this.parent.parse(this.element);
+      if (bookmark) {
+        rangy.restoreSelection(bookmark);
+      }
     },
 
     show: function() {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wysihtml-rails
 version: !ruby/object:Gem::Version
-  version: 0.5.0.beta2
+  version: 0.5.0.beta3
 platform: ruby
 authors:
 - Tanel Jakobsoo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-11 00:00:00.000000000 Z
+date: 2014-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties