wysihtml5x-rails 0.4.14 → 0.4.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a62302cf2161ea8009dc686b2aac7ed5d21497d4
-  data.tar.gz: dce9c57421e7dc5f036aa5b2e44f08e6ad7baeae
+  metadata.gz: ba024a9b86e38263a64b95fde68d97da99bb70af
+  data.tar.gz: 51a1b1328c88a9b8d764166cdcad14f676f498b5
 SHA512:
-  metadata.gz: 88049254529377d2d42acac2aca88e318a482b59356d5c1d54e0a5a82cd2743a488bcce445750cf62e3b68fa52ef7975c077e770060abcea5aa4fafa4f9cc577
-  data.tar.gz: 9c59577f4e2543ca81daa02696c33bba1d8b3d97679a4b340114cdfd7d5cb3d336f0f4dcbbde7d6e81acd3c615ca933063e5b0edb6d630336d57293222b1a6dd
+  metadata.gz: 90a924710a8ebbbd0181886aaf43c42dd4799197d6ebd73c3e870be8c54a3fb515adfa1f9e5c0b1f08a71f85bcf14e43d9a0c91307ac6cb905b9ca8473d449bd
+  data.tar.gz: 0a8bd1c1d27715c7241ca089ab9b30d3624ec343ebbbdf9f231f4df5ff474f6aac4966df5c06145d67552cbdc4e5b71cf1e91953a972c8c1cfc368edb9636f73

data/lib/wysihtml5x/rails/version.rb

@@ -1,5 +1,5 @@
 module Wysihtml5x
   module Rails
-    VERSION = "0.4.14"
+    VERSION = "0.4.15"
   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.14
+ * @license wysihtml5x v0.4.15
  * https://github.com/Edicy/wysihtml5
  *
  * Author: Christopher Blum (https://github.com/tiff)
@@ -36,7 +36,7 @@ if(!Array.isArray) {
  *
  */
 var wysihtml5 = {
-  version: "0.4.14",
+  version: "0.4.15",
 
   // namespaces
   commands:   {},
@@ -8325,15 +8325,15 @@ wysihtml5.dom.getPastedHtml = function(event) {
 wysihtml5.dom.getPastedHtmlWithDiv = function (composer, f) {
   var selBookmark = composer.selection.getBookmark(),
       doc = composer.element.ownerDocument,
-      cleanerDiv = coc.createElement('DIV');
+      cleanerDiv = doc.createElement('DIV');
   
+  doc.body.appendChild(cleanerDiv);
+
   cleanerDiv.style.width = "1px";
   cleanerDiv.style.height = "1px";
-  cleanerDiv.style.visibility = "hidden";
   cleanerDiv.style.overflow = "hidden";
 
   cleanerDiv.setAttribute('contenteditable', 'true');
-  doc.body.appendChild(cleanerDiv);
   cleanerDiv.focus();
 
   setTimeout(function () {
@@ -9491,6 +9491,10 @@ wysihtml5.quirks.ensureProperClearing = (function() {
         return this.getSelection().isCollapsed;
     },
 
+    getHtml: function() {
+      return this.getSelection().toHtml();
+    },
+
     isEndToEndInNode: function(nodeNames) {
       var range = this.getRange(),
           parentElement = range.commonAncestorContainer,
@@ -12863,11 +12867,22 @@ wysihtml5.views.View = Base.extend(
     });
 
     dom.observe(element, pasteEvents, function(event) {
-      //setTimeout(function() {
-        that.parent.fire(event.type, event).fire(event.type + ":composer", event);
-      //}, 0);
+      that.parent.fire(event.type, event).fire(event.type + ":composer", event);
     });
 
+
+    if (this.config.copyedFromMarking) {
+      // If supported the copied source is based directly on selection
+      // Very useful for webkit based browsers where copy will otherwise contain a lot of code and styles based on whatever and not actually in selection.
+      dom.observe(element, "copy", function(event) {
+        if (event.clipboardData) {
+          event.clipboardData.setData("text/html", that.config.copyedFromMarking + that.selection.getHtml());
+          event.preventDefault();
+        }
+        that.parent.fire(event.type, event).fire(event.type + ":composer", event);
+      });
+    }
+
     // --------- neword event ---------
     dom.observe(element, "keyup", function(event) {
       var keyCode = event.keyCode;
@@ -13248,7 +13263,12 @@ wysihtml5.views.View = Base.extend(
     contentEditableMode: false,
     // Classname of container that editor should not touch and pass through
     // Pass false to disable
-    uneditableContainerClassname: "wysihtml5-uneditable-container"
+    uneditableContainerClassname: "wysihtml5-uneditable-container",
+    // Browsers that support copied source handling will get a marking of the origin of the copied source (for determinig code cleanup rules on paste)
+    // Also copied source is based directly on selection - 
+    // (very useful for webkit based browsers where copy will otherwise contain a lot of code and styles based on whatever and not actually in selection).
+    // If falsy value is passed source override is also disabled
+    copyedFromMarking: '<meta name="copied-from" content="wysihtml5">'
   };
 
   wysihtml5.Editor = wysihtml5.lang.Dispatcher.extend(

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.14
+ * @license wysihtml5x v0.4.15
  * https://github.com/Edicy/wysihtml5
  *
  * Author: Christopher Blum (https://github.com/tiff)
@@ -36,7 +36,7 @@ if(!Array.isArray) {
  *
  */
 var wysihtml5 = {
-  version: "0.4.14",
+  version: "0.4.15",
 
   // namespaces
   commands:   {},
@@ -8325,15 +8325,15 @@ wysihtml5.dom.getPastedHtml = function(event) {
 wysihtml5.dom.getPastedHtmlWithDiv = function (composer, f) {
   var selBookmark = composer.selection.getBookmark(),
       doc = composer.element.ownerDocument,
-      cleanerDiv = coc.createElement('DIV');
+      cleanerDiv = doc.createElement('DIV');
   
+  doc.body.appendChild(cleanerDiv);
+
   cleanerDiv.style.width = "1px";
   cleanerDiv.style.height = "1px";
-  cleanerDiv.style.visibility = "hidden";
   cleanerDiv.style.overflow = "hidden";
 
   cleanerDiv.setAttribute('contenteditable', 'true');
-  doc.body.appendChild(cleanerDiv);
   cleanerDiv.focus();
 
   setTimeout(function () {
@@ -9491,6 +9491,10 @@ wysihtml5.quirks.ensureProperClearing = (function() {
         return this.getSelection().isCollapsed;
     },
 
+    getHtml: function() {
+      return this.getSelection().toHtml();
+    },
+
     isEndToEndInNode: function(nodeNames) {
       var range = this.getRange(),
           parentElement = range.commonAncestorContainer,
@@ -12863,11 +12867,22 @@ wysihtml5.views.View = Base.extend(
     });
 
     dom.observe(element, pasteEvents, function(event) {
-      //setTimeout(function() {
-        that.parent.fire(event.type, event).fire(event.type + ":composer", event);
-      //}, 0);
+      that.parent.fire(event.type, event).fire(event.type + ":composer", event);
     });
 
+
+    if (this.config.copyedFromMarking) {
+      // If supported the copied source is based directly on selection
+      // Very useful for webkit based browsers where copy will otherwise contain a lot of code and styles based on whatever and not actually in selection.
+      dom.observe(element, "copy", function(event) {
+        if (event.clipboardData) {
+          event.clipboardData.setData("text/html", that.config.copyedFromMarking + that.selection.getHtml());
+          event.preventDefault();
+        }
+        that.parent.fire(event.type, event).fire(event.type + ":composer", event);
+      });
+    }
+
     // --------- neword event ---------
     dom.observe(element, "keyup", function(event) {
       var keyCode = event.keyCode;
@@ -13248,7 +13263,12 @@ wysihtml5.views.View = Base.extend(
     contentEditableMode: false,
     // Classname of container that editor should not touch and pass through
     // Pass false to disable
-    uneditableContainerClassname: "wysihtml5-uneditable-container"
+    uneditableContainerClassname: "wysihtml5-uneditable-container",
+    // Browsers that support copied source handling will get a marking of the origin of the copied source (for determinig code cleanup rules on paste)
+    // Also copied source is based directly on selection - 
+    // (very useful for webkit based browsers where copy will otherwise contain a lot of code and styles based on whatever and not actually in selection).
+    // If falsy value is passed source override is also disabled
+    copyedFromMarking: '<meta name="copied-from" content="wysihtml5">'
   };
 
   wysihtml5.Editor = wysihtml5.lang.Dispatcher.extend(

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wysihtml5x-rails
 version: !ruby/object:Gem::Version
-  version: 0.4.14
+  version: 0.4.15
 platform: ruby
 authors:
 - Tanel Jakobsoo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-10 00:00:00.000000000 Z
+date: 2014-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties