dante-editor 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2cfab9a7cc9692beab99dac0d5a60bae095b0317
-  data.tar.gz: 5665200f9948f8ef09ac040e941862240271ac95
+  metadata.gz: 42a79ee4be9f59793dce73ca060ce2cf8b8edc3e
+  data.tar.gz: caf812a9e82f5130b042ebd42b26bf739984fed2
 SHA512:
-  metadata.gz: 32c100555c921c8f70f318e8f1f8b4fcf5af68c7192f595a04f9d4b7ca8c77d44c42eb76957b4e1d842776e1582e3c8e979392a1e59e8f21258a8694aaf7d267
-  data.tar.gz: 17511f2883bb0b03a6614119ca4d1bd63f5e82f3f456cebe19f2d78d99c25af0da8f2d3218aecad31648f07672d86be14aa1ff5876743f492ba8706e2276bfc4
+  metadata.gz: 10ce2589c5954b40265a03f0b5563b87286ae926a196c2edb4e9cb38d642b205f4489d561efc631b77d542ef6d3eda83556e6abdc4473302b37209bea1977fc0
+  data.tar.gz: 7f7c6aa3f7c8870db6fd09dd67698db896b9d573acc2eed2a261323fb16bbc6a463f9c73a0ef6d88328377056c91802ca61393bb7e79b354fb3476a713cd2b87

data/app/assets/javascripts/dante/behaviors/paste.js.coffee

@@ -22,20 +22,31 @@ class Dante.View.Behavior.Paste extends Dante.View.Behavior
       pastedText = if _.isEmpty(cbd.getData('text/html')) then cbd.getData('text/plain') else cbd.getData('text/html')
 
     utils.log("Process and handle text...")
+    utils.log(pastedText)
     #detect if is html
     if pastedText.match(/<\/*[a-z][^>]+?>/gi)
       utils.log("HTML DETECTED ON PASTE")
-      pastedText = pastedText.replace(/&.*;/g, "")
+      #pastedText = pastedText.replace(/&.*;/g, "")
 
-      #convert pasted divs in p before copy contents into div
+      # convert pasted divs in p before copy contents into div
       pastedText = pastedText.replace(/<div>([\w\W]*?)<\/div>/gi, '<p>$1</p>')
 
-      #create the placeholder element and assign pasted content
+      # create the placeholder element and assign pasted content
       document.body.appendChild( $("<div id='#{@editor.paste_element_id.replace('#', '')}' class='dante-paste'></div>")[0] )
+
+      paste_el = $(@editor.paste_element_id)
+      paste_el.html("<span>#{pastedText}</span>")
+      nodes = $(paste_el.html()).insertBefore($(parent))
       
-      $(@editor.paste_element_id).html("<span>#{pastedText}</span>")
+      # clean pasted content
+      # TODO: this will sanitize all editor 
+      # content and the selection will be lost!
+      # but for now it works better
+
+      @editor.parseInitialMess()
 
-      #clean pasted content
+      # clean pasted content
+      ###
       @editor.setupElementsClasses $(@editor.paste_element_id), (e)=>
         # e is the target object which is cleaned
         nodes = $(e.html()).insertAfter($(parent))
@@ -59,6 +70,7 @@ class Dante.View.Behavior.Paste extends Dante.View.Behavior
         $('html, body').animate
           scrollTop: top
         , 20
+      ###
 
       @editor.continue = false
       return false # Prevent the default handler from running.

data/bower.json

@@ -2,7 +2,7 @@
   "name" : "dante",
   "description": "Just another Medium editor clone.",
   "homepage": "michelson.github.io/Dante/",
-  "version" : "0.1.5",
+  "version" : "0.1.6",
   "keywords": [
     "css",
     "sass",

data/dist/js/dante-editor.js

@@ -8,7 +8,7 @@
     defaults: {
       image_placeholder: '../images/dante/media-loading-placeholder.png'
     },
-    version: "0.1.5"
+    version: "0.1.6"
   };
 
 }).call(this);
@@ -1825,7 +1825,7 @@
     };
 
     Paste.prototype.handlePaste = function(ev, parent) {
-      var cbd, pastedText;
+      var cbd, nodes, paste_el, pastedText;
       utils.log("pasted!");
       pastedText = void 0;
       if (window.clipboardData && window.clipboardData.getData) {
@@ -1835,30 +1835,41 @@
         pastedText = _.isEmpty(cbd.getData('text/html')) ? cbd.getData('text/plain') : cbd.getData('text/html');
       }
       utils.log("Process and handle text...");
+      utils.log(pastedText);
       if (pastedText.match(/<\/*[a-z][^>]+?>/gi)) {
         utils.log("HTML DETECTED ON PASTE");
-        pastedText = pastedText.replace(/&.*;/g, "");
         pastedText = pastedText.replace(/<div>([\w\W]*?)<\/div>/gi, '<p>$1</p>');
         document.body.appendChild($("<div id='" + (this.editor.paste_element_id.replace('#', '')) + "' class='dante-paste'></div>")[0]);
-        $(this.editor.paste_element_id).html("<span>" + pastedText + "</span>");
-        this.editor.setupElementsClasses($(this.editor.paste_element_id), (function(_this) {
-          return function(e) {
-            var last_node, new_node, nodes, num, top;
-            nodes = $(e.html()).insertAfter($(parent));
-            e.remove();
-            last_node = nodes.last()[0];
-            num = last_node.childNodes.length;
-            _this.editor.setRangeAt(last_node, num);
-            new_node = $(_this.editor.getNode());
-            _this.editor.markAsSelected(new_node);
-            _this.editor.displayTooltipAt($(_this.editor.el).find(".is-selected"));
-            _this.editor.handleUnwrappedImages(nodes);
-            top = new_node.offset().top;
-            return $('html, body').animate({
-              scrollTop: top
-            }, 20);
-          };
-        })(this));
+        paste_el = $(this.editor.paste_element_id);
+        paste_el.html("<span>" + pastedText + "</span>");
+        nodes = $(paste_el.html()).insertBefore($(parent));
+        this.editor.parseInitialMess();
+
+        /*
+        @editor.setupElementsClasses $(@editor.paste_element_id), (e)=>
+           * e is the target object which is cleaned
+          nodes = $(e.html()).insertAfter($(parent))
+           *remove paste div since we wont use it until the next paste
+          e.remove()
+           *set caret on newly created node
+          last_node = nodes.last()[0]
+          num = last_node.childNodes.length
+          @editor.setRangeAt(last_node, num)
+          
+           *select new node
+          new_node = $(@editor.getNode())
+          @editor.markAsSelected(new_node)
+          @editor.displayTooltipAt($(@editor.el).find(".is-selected"))
+          
+           * wrap new images
+          @editor.handleUnwrappedImages(nodes)
+        
+           *scroll to element top
+          top = new_node.offset().top
+          $('html, body').animate
+            scrollTop: top
+          , 20
+         */
         this.editor["continue"] = false;
         return false;
       }

data/lib/dante-editor/version.rb

@@ -1,5 +1,5 @@
 require "dante-editor/version"
 
 module DanteEditor
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dante-editor
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Miguel Michelson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-17 00:00:00.000000000 Z
+date: 2016-06-18 00:00:00.000000000 Z
 dependencies: []
 description: dante-editor yet another Medium editor clone.
 email:
@@ -158,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: dante-editor yet another Medium editor clone.