burp_cms 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77768a62b23bf9637e0bb038ff41512870d7e7cd
-  data.tar.gz: 805cc1e568243527f35ad5ab3b5e70296dc5b0fc
+  metadata.gz: b66d58dd292c111e95c3a40956ede7dec5d8b647
+  data.tar.gz: dc9b9619b4fa6c18e3e4d907adc9e301674ec7df
 SHA512:
-  metadata.gz: 26c5128fe90a1b8f53f3ae83909181abb8a2481c02590f8531dfd369a2300a0ce6f9d0401cafdb1e13f9a4f0ecf3c241a1ad05d65069d49c9b3900875d8e4544
-  data.tar.gz: ca901f5ba6dd870aa01fda17d271d1d55950397c8fd6f7ac84fb6e164429da75f84063eec37df8699cba0a82ca7cf8d42a61100deed8cc417b710910ba49a343
+  metadata.gz: 94489889d76ae8f8ff66d95d4e4b03d24f092cdc873730bd14402e93e96261fb6f2093cddcdd72552a1d1cfc30845dc115d23ad77354cc11d793ea49116d584d
+  data.tar.gz: 9738290fae41c0562b77a05dc90c1947bcd856b96d42d585a8edfa443fc65139704307a458d81ade8a1d65a44742c974e79d33f8d1af1269d1651430225bf6e5

data/app/assets/packages/burp/editing/js/content-decorator.js

@@ -16,14 +16,15 @@
       },
       append: function(snippetName, element) {
         console.debug('append', snippetName, element);
+      },
+      setPositionClass: function(className, element) {
+        console.debug('setPositionClass', className, element);
       }
     };
 
     if (typeof(options) === 'object') {
       this.onUpdate = options['update'];
     }
-    
-    this.init();
   }
   
   window.ContentDecorator = ContentDecorator;
@@ -32,10 +33,13 @@
     $('body > .dropbox').remove();
   }
 
-  function initializeMovable(contentEditor, elements, createCallback) {
+  function initializeMovable(contentEditor, elements, cloneImage) {
     if (!$(elements).hasClass('movable')) {
       
       $(elements).addClass('movable');
+      if(typeof(cloneImage) === "undefined") {
+        cloneImage = false;
+      }
       
       $(elements).draggable({
         cursor: 'move',
@@ -142,28 +146,34 @@
             drop: function(event, ui) {              
               
               if(!ui.draggable.data("removed")) {
-                var className = $(this).removeClass('dropzone')[0].className;
-                var img = createCallback(ui.draggable[0], className);
-
-                initializeMovable(contentEditor, img, function(element, positionClass) { 
-                  $(element).removeClass('left center right ui-droppable movable ui-draggable');
-                  $(element).addClass(positionClass);
-                  return element;
-                });
-
+                
+                var className = $(this).removeClass('dropzone ui-droppable')[0].className;
+                var imageElement = ui.draggable[0];
                 var markdown = $(this).parent().data("target-element");
                 
-                var src = $(img).attr('src');
-                if(src.match(/\/files\/small\//)) {
-                  $(img).attr('src',src.replace(/\/files\/small\//,'/files/large/'));
-                }
+                $(imageElement).removeClass('left center right');
+                $(imageElement).addClass(className);
                 
-                if($(this).parent().is(".bottom-dropbox")) {
-                  snippets().snippets[contentEditor.snippetName].append(img);
-                  contentEditor.callbacks.append(contentEditor.snippetName, img);
-                } else if(img !== markdown) {
-                  $(img).insertBefore(markdown);
-                  contentEditor.callbacks.insertBefore($(markdown), img);
+                if(markdown === imageElement) {
+                  contentEditor.callbacks.setPositionClass(className, $(imageElement));
+                } else {
+
+                  // var src = $(img).attr('src');
+                  // if(src.match(/\/files\/small\//)) {
+                  //   $(img).attr('src', src.replace(/\/files\/small\//,'/files/large/'));
+                  // }
+                  
+                  if(cloneImage) {
+                    imageElement = $(imageElement).clone();
+                  }
+
+                  if($(this).parent().is(".bottom-dropbox")) {
+                    snippets().snippets[contentEditor.snippetName].append($(imageElement));
+                    contentEditor.callbacks.append(contentEditor.snippetName, $(imageElement));
+                  } else {
+                    $(imageElement).insertBefore(markdown);
+                    contentEditor.callbacks.insertBefore($(markdown), $(imageElement));
+                  }
                 }
                 
                 clearDropBoxes();
@@ -191,18 +201,6 @@
   
   $.extend(ContentDecorator.prototype, {
     
-    init: function() {
-      var contentEditor = this;
-      $(this.element).find("> .movable").each(function() {
-        $(this).removeClass('movable');
-        initializeMovable(contentEditor, this, function(element, positionClass) { 
-          $(element).removeClass('left center right ui-droppable movable ui-draggable');
-          $(element).addClass(positionClass);
-          return element;
-        });
-      });
-    },
-    
     setSnippetName: function(snippetName) {
       this.snippetName = snippetName;
     },
@@ -270,8 +268,8 @@
     //       },10);
     //     },
     
-    makeDroppable: function(elements, createCallback) {
-      initializeMovable(this, elements, createCallback);
+    makeDroppable: function(elements, cloneImage) {
+      initializeMovable(this, elements, cloneImage);
     },
     
     addRemoveZone: function(element) {

data/app/assets/packages/burp/editing/js/main.js

@@ -90,9 +90,7 @@ $(function() {
         }
       });
 
-      contentDecorator.makeDroppable('#gallery img', function(element, positionClass) {
-        return $("<img src='" + $(element).attr('src') + "' class='" + positionClass + "' />");
-      });
+      contentDecorator.makeDroppable('#gallery img', true);
       
       $('#gallery').trigger('reset');
     });
@@ -156,9 +154,7 @@ $(function() {
     domSnippetState[snippetName] = elements.clone();
     snippets().snippets[snippetName].update(elements);
     
-    contentDecorator.makeDroppable(elements, function(element, positionClass) {
-      return $("<img src='" + $(element).attr('src') + "' class='" + positionClass + "' />");
-    });
+    contentDecorator.makeDroppable(elements, false);
   }
     
   function addEditor() {
@@ -348,13 +344,16 @@ $(function() {
           insertBefore: function(beforeElement, element) {
             $(element).removeClass('ui-droppable movable ui-draggable');
             
+            var remove_eid = element.attr('eid');
+            var remove_cssSelector = '[eid="'+ remove_eid +'"]';
+            
             var eid = beforeElement.attr('eid');
             var snippetName = eid.split(/-/)[0];
-            
             var cssSelector = '[eid="'+ eid +'"]';
             
             var root = $('<div></div>');
             root.append(domSnippetState[snippetName]);
+            root.find(remove_cssSelector).remove();
             element.insertBefore(root.find(cssSelector));
             domSnippetState[snippetName] = root.children();
             
@@ -369,6 +368,25 @@ $(function() {
             
             domSnippetState[snippetName] = $('<div></div>').append(domSnippetState[snippetName]).append(element).children();
             
+            snippetEditorState[snippetName] = Html2Markdown(removeIDs(domSnippetState[snippetName]));
+            loadSnippet(snippetName, function(snippet) {
+              editor.setValue(snippet);
+              editor.refresh();
+            });
+          },
+          setPositionClass: function(positionClassName, imageElement) {
+            
+            var eid = $(imageElement).attr('eid');
+            var snippetName = eid.split(/-/)[0];
+            
+            var cssSelector = '[eid="'+ eid +'"]';
+            
+            var root = $('<div></div>');
+            root.append(domSnippetState[snippetName]);
+            root.find(cssSelector).removeClass("left right center");
+            root.find(cssSelector).addClass(positionClassName);
+            domSnippetState[snippetName] = root.children();
+            
             snippetEditorState[snippetName] = Html2Markdown(removeIDs(domSnippetState[snippetName]));
             loadSnippet(snippetName, function(snippet) {
               editor.setValue(snippet);

data/lib/burp/version.rb

@@ -1,3 +1,3 @@
 module Burp
-  VERSION = "1.5.0"
+  VERSION = "1.5.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: burp_cms
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Darwin