burp_cms 1.3.33 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 856bc5368305ee60069da52c8e123618a8b0a041
-  data.tar.gz: b5e3cb1676752eaf84f2f8d57dd03207b7450273
+  metadata.gz: 564123161aa7b130c03532e1a5fb5035034aa38c
+  data.tar.gz: d79287f16ca452d61eb030245a8fc297516e949b
 SHA512:
-  metadata.gz: 2a9cc0ab5483fdd788e983ad2d78b1683b2003fdccf57fa19cfb65e6c71da5e73e4b18a4739f02052b811168f4b81339f6ace1c6209aced0c23d3ec93d1e2961
-  data.tar.gz: f9cb1b2ae76aaefee5511675f276bb53e1c802731564597d19316f394b26acac7428568dbbd3f86adfa084f16803be591b0b6062022d21068db295cd2e3dcc9c
+  metadata.gz: bb0d67f9ae6ca1c42de01bfd85782bf44035aaeddb6d783e534c7c3d0860ed421edd96b19f6ee5401f4acfa9ab0f1937fa702bcdc226877aebcdab53e6b5462e
+  data.tar.gz: d3b0fb6a094a7595ecd2a7f5954ad6cb8c4789ebedc490fab09aea7dd1c6a36424e0b7384c614cb13df872874aa36936937fb04018f003cf424b7d94cdf7fc43

data/README.markdown

@@ -59,7 +59,7 @@ To use snippets on pages not cought by the CatchAllController. The or part is to
 
     before_filter :load_cms_page
     def load_cms_page
-      @cms_page = Burp.find_page(request.path) || Burp::Page.new(:snippets => [], :title => "", :id => request.path)
+      @cms_page = Burp.find_page(request.path) || Burp::Page.new(:id => request.path)
     end
 
 ## Title

data/app/assets/javascripts/burp/cms_helper.js

@@ -1,52 +0,0 @@
-(function(window,jQuery) {
-  
-  var $ = jQuery;
-  
-  window.snippets = function() {
-    
-    var snippets = {names:[],snippets:{}};
-    
-    var snippetComments = $("*:not(iframe)").contents().filter(function() {
-      try {
-        return this.nodeType === 8 && this.data.match(/snippet data-type=\"start\"/);
-      } catch (e) {
-        // Yay for not being allow to look at dom elements with external content, aka iframes
-        return false;
-      }
-    });
-    
-    snippetComments.map(function() {
-      
-      var name = this.data.match(/data-name=\"(.*?)\"/)[1];
-      var pageId = this.data.match(/data-page-id=\"(.*?)\"/)[1];
-      
-      snippets.names.push(name);
-      
-      snippets.snippets[name] = {
-        pageId:pageId,
-        comment:this,
-        elements:function() {
-          
-          var snippetElements = [];
-          var element = this.comment;
-          while(element.nextSibling) {
-            element = element.nextSibling;
-            if(element.nodeType === 8 && element.data.match(/snippet data-type=\"end\"/)) {
-              break;
-            }
-            snippetElements.push(element);
-          }
-          
-          return $(snippetElements);
-        },
-        update:function(newElements) {
-          this.elements().remove();
-          $(newElements).insertAfter(this.comment);
-        }
-      };
-    });
-    
-    return snippets;
-  };
-  
-}(window,jQuery));

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

@@ -14,6 +14,8 @@
 //= require ./editing/dep/CodeMirror-2.3/mode/htmlmixed/htmlmixed.js
 //= require ./editing/dep/CodeMirror-2.3/mode/xml/xml.js
 //= require ./editing/dep/CodeMirror-2.3/mode/markdown/markdown.js
+//= require ./editing/js/disableJavascript.js
+//= require ./editing/js/snippets.js
 //= require ./editing/js/main.js
 
 

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

@@ -1,22 +1,23 @@
 /*global
-  marked markdown2Html
+  markdown2Html snippets
 */
 (function($) {
   
   var javascript_warning_has_been_shown = false;
   
-  marked.setOptions({
-    gfm: true,
-    pedantic: false,
-    sanitize: false
-  });
-  
-  function unescapeJavascript(script) {
-    return script.replace(/&quot;/g,'"').replace(/&#39;/g,"'").replace(/&lt;/g,"<").replace(/&gt;/g,"<");
-  }
-  
-  function ContentDecorator(element, options) {
-    this.element = $(element);
+  function ContentDecorator(snippetName, options) {
+    this.snippetName = snippetName;
+    this.callbacks = {
+      remove: function(element) {
+        console.debug("remove", element);
+      },
+      insertBefore: function(beforeElement, element) {
+        console.debug('insertBefore', beforeElement, element);
+      },
+      append: function(snippetName, element) {
+        console.debug('append', snippetName, element);
+      }
+    };
 
     if (typeof(options) === 'object') {
       this.onUpdate = options['update'];
@@ -59,7 +60,8 @@
           var bodyOffset =  $('body').offset();
           var bodyPosition = $('body').css('position');
           
-          contentEditor.element.find('> h1,> h2,> h3,> h4,> h5,> p,> img,> blockquote,> ul,> ol').each(function() {
+          var snippetElements = snippets().snippets[contentEditor.snippetName].elements();
+          $(snippetElements).filter('h1, h2, h3, h4, h5, p, img, blockquote, ul, ol').each(function() {
       
             var position = $(this).offset();
             var size = {width:$(this).outerWidth(),height:$(this).outerHeight()};
@@ -144,7 +146,7 @@
                 var img = createCallback(ui.draggable[0], className);
 
                 initializeMovable(contentEditor, img, function(element, positionClass) { 
-                  $(element).removeClass('left center right');
+                  $(element).removeClass('left center right ui-droppable movable ui-draggable');
                   $(element).addClass(positionClass);
                   return element;
                 });
@@ -157,10 +159,13 @@
                 }
                 
                 if($(this).parent().is(".bottom-dropbox")) {
-                  $(contentEditor.element).append(img);
+                  snippets().snippets[contentEditor.snippetName].append(img);
+                  contentEditor.callbacks.append(contentEditor.snippetName, img);
                 } else if(img !== markdown) {
                   $(img).insertBefore(markdown);
+                  contentEditor.callbacks.insertBefore($(markdown), img);
                 }
+                
                 clearDropBoxes();
               }
               
@@ -184,14 +189,6 @@
     }
   }
   
-  function removeDraggable( element ) {
-    element.find( ".movable" ).draggable( "destroy" );
-  }
-  
-  function removeRemoveZone() {
-    $('.remove-zone').removeClass('remove-zone').droppable( "destroy" );
-  }
-  
   $.extend(ContentDecorator.prototype, {
     
     init: function() {
@@ -199,112 +196,86 @@
       $(this.element).find("> .movable").each(function() {
         $(this).removeClass('movable');
         initializeMovable(contentEditor, this, function(element, positionClass) { 
-          $(element).removeClass('left center right');
+          $(element).removeClass('left center right ui-droppable movable ui-draggable');
           $(element).addClass(positionClass);
           return element;
         });
       });
     },
     
-    
-    cleanup: function() {
-      removeDraggable(this.element);
-      removeRemoveZone();
+    setSnippetName: function(snippetName) {
+      this.snippetName = snippetName;
     },
     
-    getHtml: function() {
-      
-      var html = this.element.clone();
-      html.find('script[type="text/dont-run-javascript"]').each(function() {
-        $(this).attr("type",'text/javascript');
-      });
-      
-      return html.find('.movable').removeClass('ui-draggable ui-droppable').end().html();
-    },
-    
-    getMarkdown: function() {
-      return this.markdown;
+    setCallbacks: function(callbacks) {
+      this.callbacks = callbacks;
     },
     
-    setMarkdown: function(markdown) {
-      if (this.markdown !== markdown) {
-        this.markdown = markdown;
-        this.updateContent();
-
-        if (this.onUpdate) {
-          this.onUpdate();
-        }
-      }
-    },
-    
-    updateContent: function() {
-      var html = window.markdown2Html(this.markdown);
-      
-      if(this.lastHtml === html) {
-        return;
-      }
-      this.lastHtml = html;
-      
-      var children = $(html);
-      
-      // Fix script escaping of text in script elements
-      children.each(function() {
-        if($(this).is("script")) {
-          $(this).text(unescapeJavascript($(this).text()));
-          $(this).attr('type','text/dont-run-javascript');
-        } else {
-          $(this).find('script').each(function() {
-            $(this).text(unescapeJavascript($(this).text()));
-            $(this).attr('type','text/dont-run-javascript');
-          });
-        }
-      });
-      
-      var tempElement = $('<div></div>');
-      tempElement.append(children);
-      
-      if(tempElement.find("script").length > 0 && !javascript_warning_has_been_shown) {
-        $.gritter.add({
-          title: 'WARNING!',
-          text: ' Javascript found! The javascript will not be previewed but it will be saved.<br><br>Save and reload to test the javascript.',
-          time: 20000
-        });
-        
-        javascript_warning_has_been_shown = true;
-      }
-      
-      // Fixes so that we don't reload images on each update
-      var _this = this;
-      tempElement.find('img').each(function() {
-        var element = _this.element.find('img[src="'+$(this).attr('src')+'"]');
-        if(element.length === 1) {
-          if(element[0].outerHTML === this.outerHTML) {
-            $(this).replaceWith(element);
-          }
-        }
-      });
-      
-      this.element.html("");
-      this.element.append(tempElement.children());
-      
-      setTimeout(function() {
-        initializeMovable(_this, _this.element.find('> img'), function(element, positionClass) { 
-          $(element).removeClass('left center right');
-          $(element).addClass(positionClass);
-          return element;
-        });
-      },10);
-    },
+    // updateContent: function() {
+    //       var html = window.markdown2Html(this.markdown);
+    //       
+    //       if(this.lastHtml === html) {
+    //         return;
+    //       }
+    //       this.lastHtml = html;
+    //       
+    //       var children = $(html);
+    //       
+    //       // Fix script escaping of text in script elements
+    //       children.each(function() {
+    //         if($(this).is("script")) {
+    //           $(this).text(unescapeJavascript($(this).text()));
+    //           $(this).attr('type','text/dont-run-javascript');
+    //         } else {
+    //           $(this).find('script').each(function() {
+    //             $(this).text(unescapeJavascript($(this).text()));
+    //             $(this).attr('type','text/dont-run-javascript');
+    //           });
+    //         }
+    //       });
+    //       
+    //       var tempElement = $('<div></div>');
+    //       tempElement.append(children);
+    //       
+    //       if(tempElement.find("script").length > 0 && !javascript_warning_has_been_shown) {
+    //         $.gritter.add({
+    //           title: 'WARNING!',
+    //           text: ' Javascript found! The javascript will not be previewed but it will be saved.<br><br>Save and reload to test the javascript.',
+    //           time: 20000
+    //         });
+    //         
+    //         javascript_warning_has_been_shown = true;
+    //       }
+    //       
+    //       // Fixes so that we don't reload images on each update
+    //       var _this = this;
+    //       tempElement.find('img').each(function() {
+    //         var element = _this.element.find('img[src="'+$(this).attr('src')+'"]');
+    //         if(element.length === 1) {
+    //           if(element[0].outerHTML === this.outerHTML) {
+    //             $(this).replaceWith(element);
+    //           }
+    //         }
+    //       });
+    //       
+    //       this.element.html("");
+    //       this.element.append(tempElement.children());
+    //       
+    //       setTimeout(function() {
+    //         initializeMovable(_this, _this.element.find('> img'), function(element, positionClass) { 
+    //           $(element).removeClass('left center right');
+    //           $(element).addClass(positionClass);
+    //           return element;
+    //         });
+    //       },10);
+    //     },
     
     makeDroppable: function(elements, createCallback) {
       initializeMovable(this, elements, createCallback);
     },
     
-    removeDroppable: function(elements) {
-      $(elements).draggable( 'destroy' );
-    },
-    
     addRemoveZone: function(element) {
+      var contentEditor = this;
       $(element).addClass('remove-zone');
       $(element).droppable({
         hoverClass: 'remove-hover',
@@ -313,6 +284,7 @@
           if(ui.draggable.parents("#gallery").length === 0) {
             setTimeout(function() {
               // jquery-ui breaks if we remove the element during the callback
+              contentEditor.callbacks.remove(ui.draggable);
               ui.draggable.remove();
             },0);
             ui.draggable.data("removed",true);

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

@@ -0,0 +1,49 @@
+/*global
+    
+*/
+
+(function(window) {
+
+  if(typeof(window.burp) == "undefined") {
+    window.burp = {};
+  }
+  
+  function unescapeJavascript(script) {
+    return script.replace(/&quot;/g,'"').replace(/&#39;/g,"'").replace(/&lt;/g,"<").replace(/&gt;/g,"<");
+  }
+
+  var javascript_warning_has_been_shown = false;
+
+  function warnAboutJavascript() {
+    if(!javascript_warning_has_been_shown) {
+      $.gritter.add({
+        title: 'WARNING!',
+        text: ' Javascript found! The javascript will not be previewed but it will be saved.<br><br>Save and reload to test the javascript.',
+        time: 20000
+      });
+    
+      javascript_warning_has_been_shown = true;
+    }
+  }
+  
+  function disableScriptElements(elements) {
+    $(elements).each(function() {
+      if($(this).is("script")) {
+        $(this).text(unescapeJavascript($(this).text()));
+        $(this).attr('type','text/dont-run-javascript');
+        warnAboutJavascript();
+      } else {
+        $(this).find('script').each(function() {
+          $(this).text(unescapeJavascript($(this).text()));
+          $(this).attr('type','text/dont-run-javascript');
+          warnAboutJavascript();
+        });
+      }
+    });
+    
+    return elements;
+  }
+
+  window.burp.disableScriptElements = disableScriptElements;
+
+}(window));

data/app/assets/packages/burp/editing/js/jquery.html2markdown.js

@@ -101,7 +101,7 @@ function Html2Markdown(value) {
   
   dom.find('> blockquote').each(function() {
     if(!shouldSkip(this)) {  
-      $(this).replaceWith("> "+$.trim($(this).html()).replace(/\n{2,20}/g,"\n\n").replace(/\n/g,'\n> ').replace(/> \n/g,">\n"));
+      $(this).replaceWith("> "+$.trim($(this).html()).replace(/\n{2,20}/g,"\n\n").replace(/\n/g,'\n> ').replace(/> \n/g,">\n") + "\n\n");
     }
   });
   
@@ -134,5 +134,9 @@ function Html2Markdown(value) {
     });
   });
   
-  return dom.html().replace(/^&gt;/mg,'>').replace(/^&lt;/mg,'<').replace(/\n{2,20}/g,"\n\n");
+  dom.find("> img").each(function() {
+    $(this).replaceWith($("<div></div>").append($(this).clone()).html() + "\n");
+  });
+  
+  return $.trim(dom.html().replace(/^&gt;/mg,'>').replace(/^&lt;/mg,'<').replace(/\n{2,20}/g,"\n\n"));
 }

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

@@ -1,5 +1,5 @@
 /*global
-    snippets CodeMirror ContentDecorator qq Html2Markdown
+    snippets CodeMirror ContentDecorator qq Html2Markdown markdown2Html burp
 */
 
 $(function() {
@@ -12,76 +12,66 @@ $(function() {
   var contentDecorator;
   var editor;
   
-  function wrapContent() {
-    $.each(snippets().snippets,function(name,snippet) {
-      console.debug(name,snippet);
-      
-      // Fix so that we dont run javascript again
-      $(snippet.elements()).each(function() {
-        if($(this).is("script")) {
-          $(this).attr("type",'text/dont-run-javascript');
-        } else {
-          $(this).find("script").each(function() {
-            $(this).attr("type",'text/dont-run-javascript');
-          });
-        }
-      });
-      
-      snippet.update($('<div data-snippet-name="'+name+'" class="snippet-wrapper snippet-'+name+'"></div>').append($(snippet.elements())));
-    });
+  function getPathFor(snippetName) {
+    var path = window.burp_path || snippets().snippets[snippetName].pageId || window.location.pathname;
+    if(path === "/") {
+      path = "/$root";
+    }
     
-    // Remove unwanted stuff
-    $('.burp-remove, .remove-on-save').remove();
-    $('.burp-unwrap').each(function() {$(this).replaceWith(this.children);});
+    return path;
   }
   
-  function cleanup(container) {
-    container.find("p").each(function() {
-      if($(this).children().length === $(this).find('img').length) {
-        $(this).children().unwrap();
-      }
-    });
-  }
+  var snippetCache = {};
   
-  function update(value) {
-    if(value !== lastValue) {
-      lastValue = value;
-      contentDecorator.setMarkdown(value);
-      cleanup($('.snippet-'+snippetName));
+  function getHTMLForSnippet(_snippetName, callback) {
+    var path = getPathFor(snippetName);
+    
+    var cacheKey = path + _snippetName;
+    if(snippetCache[cacheKey]) {
+      setTimeout(function() {
+        callback(snippetCache[cacheKey]);
+      }, 0);
+    } else {    
+      $.ajax("/burp/pages/"+path,{
+         cache:false,
+         dataType:'json',
+         success:function(data) {
+           data = data || {snippets:{}};
+           snippetCache[cacheKey] = data.snippets[snippetName];
+           callback(snippetCache[cacheKey]);
+         }
+       });
     }
   }
   
-  function loadHTML() {
-     
-     var element = snippets().snippets[snippetName].elements().clone();
-     element.find('.markdown').each(function() {
-       $(this).removeClass('markdown');
-       if($(this).attr('class') === "") {
-         $(this).removeAttr('class');
-       }
-     });
-     
-     element.find('script[type="text/dont-run-javascript"]').each(function() {
-       $(this).attr("type",'text/javascript');
-     });
-     
-     element.find('img.movable').each(function() {
-       $(this).removeClass('movable ui-draggable ui-droppable');
-     });
-     
-     editor.setValue(Html2Markdown(element.children()));
-  }
+  var snippetEditorState = {};
   
-  function loadSnippet() {
-     var path = window.burp_path || window.location.pathname;
-     if(path === "/") {
-       path = "/$root";
+  function loadSnippet(snippetName, callback) {
+     var path = getPathFor(snippetName);
+     
+     if(typeof(callback) === "undefined") {
+       callback = function() {};
      }
      
-     loadHTML();
-     editor.clearHistory();
-     update(editor.getValue());
-     originalValue = editor.getValue();
+     if(snippetEditorState[snippetName]) {
+        callback(snippetEditorState[snippetName]);
+     } else {
+       getHTMLForSnippet(snippetName, function(html) {
+
+          var element = $("<div>" + html + "</div>");
+
+          element.find('script[type="text/dont-run-javascript"]').each(function() {
+           $(this).attr("type",'text/javascript');
+          });
+
+          element.find('img.movable').each(function() {
+           $(this).removeClass('movable ui-draggable ui-droppable');
+          });
+
+          snippetEditorState[snippetName] = Html2Markdown(element.children());
+          callback(snippetEditorState[snippetName]);
+       });
+     }
    }
   
   function loadFiles() {
@@ -119,18 +109,56 @@ $(function() {
   }
   
   function selectSnippet(_snippetName) {
+
+    snippetName = _snippetName;
+    loadSnippet(snippetName, function(snippet) {
+      editor.setValue(snippet);
+      editor.refresh();
+    });
     
-    if(contentDecorator) {
-      contentDecorator.cleanup();
-      contentDecorator.removeDroppable($('#gallery img'));
-    }
+    contentDecorator.setSnippetName(snippetName);
+  }
+  
+  function removeIDs(elements) {
     
-    snippetName = _snippetName;
-    originalHtml = $('.snippet-'+snippetName).html();
-    contentDecorator = new ContentDecorator('.snippet-'+snippetName);
-    contentDecorator.addRemoveZone('#gallery');
-    $('#code').val(originalHtml);
+    $(elements).each(function() {
+      $(this).removeAttr("eid");
+    });
+    
+    $(elements).find('*').each(function() {
+      $(this).removeAttr("eid");
+    });
     
+    return elements;
+  }
+  
+  function addIDs(snippetName, elements) {
+    
+    var count = 0;
+    
+    $(elements).each(function() {
+      $(this).attr("eid", snippetName + "-" + String(count++));
+    });
+    
+    $(elements).find('*').each(function() {
+      $(this).attr("eid", snippetName + "-" +String(count++));
+    });
+    
+    return elements;
+  }
+  
+  var domSnippetState = {};
+  
+  function updateSnippetWithMarkdown(snippetName, markdown) {
+    var html = markdown2Html(markdown);
+    var elements = burp.disableScriptElements($(html));
+    elements = addIDs(snippetName, elements);
+    domSnippetState[snippetName] = elements.clone();
+    snippets().snippets[snippetName].update(elements);
+    
+    contentDecorator.makeDroppable(elements, function(element, positionClass) {
+      return $("<img src='" + $(element).attr('src') + "' class='" + positionClass + "' />");
+    });
   }
     
   function addEditor() {
@@ -144,8 +172,9 @@ $(function() {
       matchBrackets: true,
       lineWrapping: true,
       theme: "default",
-      onChange:function(editor,changes) {
-        update(editor.getValue());
+      onChange:function(editor, changes) {
+        snippetEditorState[snippetName] = editor.getValue();
+        updateSnippetWithMarkdown(snippetName, snippetEditorState[snippetName]);
       }
     });
     
@@ -169,22 +198,16 @@ $(function() {
       editor.replaceRange(content,editor.getCursor(true),editor.getCursor(false));
     });
 
-    contentDecorator.addRemoveZone('#gallery');
-    
-    // update(editor.getValue());
     loadFiles();
   
     $.adminDock.title('');
     $.adminDock.footer.addButton({ icon: 'picture', text: "Pictures", showModule: $('#gallery') });
     $.adminDock.footer.addButton({ icon: 'edit', text: "Edit text", showModule: $('#myContentEditor'), show: function() {
-      loadHTML();
       editor.refresh();
     } });
     
     
     $(document).on('image-drop-done.burp', function() {
-      loadHTML();
-      editor.refresh();
     });
 
     var snippet_names = [];
@@ -202,13 +225,10 @@ $(function() {
         'default': snippet_names[0],
         change: function(option) {
         
-        
           selectSnippet(option);
-          loadSnippet();
-        
-          $('#gallery img').removeClass('movable');
-          contentDecorator.makeDroppable('#gallery img', function(element, positionClass) {
-            return $("<img src='" + $(element).attr('src') + "' class='" + positionClass + "' />");
+          loadSnippet(snippetName, function(snippet) {
+            editor.setValue(snippet);
+            editor.refresh();
           });
         
           console.debug("Switching to " + option);
@@ -242,38 +262,44 @@ $(function() {
     }});
     
     $.adminDock.footer.addButton({ icon: 'undo', text: 'Discard', secondary: true, click:function() {
-      // We set this as it holds all the images as when we started
-      $('.snippet-'+snippetName).html(originalHtml);
-      contentDecorator.init();
-      editor.setValue(originalValue);
+      
+      var oldSnippetEditorState = snippetEditorState;
+      snippetEditorState = {};
+      
+      $.each(oldSnippetEditorState, function(snippetName, editorState) {
+        loadSnippet(snippetName, function(snippet) {
+          updateSnippetWithMarkdown(snippetName, snippet);
+        });
+      });
+      
+      loadSnippet(snippetName, function(snippet) {
+        editor.setValue(snippet);
+        editor.refresh();
+      });
     }});
     
     $.adminDock.footer.addButton({ icon: 'save', text: 'Save', secondary: true, click:function() {
       
-      var path = window.burp_path || snippets().snippets[snippetName].pageId || window.location.pathname;
-      if(path === "/") {
-        path = "/$root";
-      }
+      var path = getPathFor(snippetName);
+      snippetCache = {};
       
       $.ajax("/burp/pages/"+path,{
-        cache:false,
-        dataType:'json',
-        success:function(data) {
+        cache: false,
+        dataType: 'json',
+        success: function(data) {
           
           data = data || {snippets:{}};
           
-          data.snippets[snippetName] = contentDecorator.getHtml();
-
+          $.each(snippetEditorState, function(snippetName, snippetState) {
+            data.snippets[snippetName] = markdown2Html(snippetEditorState[snippetName]);
+          });
+          
           $.ajax("/burp/pages/"+path,{
             type:"post",
             data:{page:data,'_method':"put"},
             dataType:'json',
             success:function() {
-              
-              originalValue = contentDecorator.getMarkdown();
-              originalHtml = contentDecorator.getHtml();
-              
-              alert("The page was saved!");
+              alert("The page has been saved!");
             }
           });
         }
@@ -287,24 +313,6 @@ $(function() {
   
   var initDone = false;
   
-  function init() {
-    if(!initDone) {
-      initDone = true;
-      
-      wrapContent();
-      selectSnippet(snippets().names.sort(function(a, b) { return a.toLowerCase() > b.toLowerCase(); })[0]);
-      addEditor();
-      
-      loadSnippet();
-      
-      $('#gallery').trigger('refresh');
-      setTimeout(function() { $('#gallery').trigger('refresh'); },300);
-      setTimeout(function() { $('#gallery').trigger('refresh'); },600);
-      setTimeout(function() { $('#gallery').trigger('refresh'); },1200);
-      setTimeout(function() { $('#gallery').trigger('refresh'); },5000);
-    }
-  }
-  
   function trigger_http_basic_auth(callback) {
     if(initDone) {
       callback();
@@ -313,21 +321,96 @@ $(function() {
     }
   }
   
-  var start_time;
-  
-  $(window).keydown(function(event) {
-    if (
-      ((event.altKey === true || event.ctrlKey === true ) && event.keyCode === 27) ||
-      (event.altKey === true && event.ctrlKey === true && event.keyCode === 32)
-      ) {
+  function init(callback) {
+    trigger_http_basic_auth(function() {
+      if(!initDone) {
+        initDone = true;
+      
+        contentDecorator = new ContentDecorator("");
+        contentDecorator.setCallbacks({
+          remove: function(element) {
+            var eid = element.attr('eid');
+            var snippetName = eid.split(/-/)[0];
+            
+            var cssSelector = '[eid="'+ eid +'"]';
+            
+            var root = $('<div></div>');
+            root.append(domSnippetState[snippetName]);
+            root.find(cssSelector).remove();
+            domSnippetState[snippetName] = root.children();
+            
+            snippetEditorState[snippetName] = Html2Markdown(removeIDs(domSnippetState[snippetName]));
+            loadSnippet(snippetName, function(snippet) {
+              editor.setValue(snippet);
+              editor.refresh();
+            });
+          },
+          insertBefore: function(beforeElement, element) {
+            $(element).removeClass('ui-droppable movable ui-draggable');
+            
+            var eid = beforeElement.attr('eid');
+            var snippetName = eid.split(/-/)[0];
+            
+            var cssSelector = '[eid="'+ eid +'"]';
+            
+            var root = $('<div></div>');
+            root.append(domSnippetState[snippetName]);
+            element.insertBefore(root.find(cssSelector));
+            domSnippetState[snippetName] = root.children();
+            
+            snippetEditorState[snippetName] = Html2Markdown(removeIDs(domSnippetState[snippetName]));
+            loadSnippet(snippetName, function(snippet) {
+              editor.setValue(snippet);
+              editor.refresh();
+            });
+          },
+          append: function(snippetName, element) {
+            $(element).removeClass('ui-droppable movable ui-draggable');
+            
+            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();
+            });
+          }
+        });
+      
+        selectSnippet(snippets().names.sort(function(a, b) { return a.toLowerCase() > b.toLowerCase(); })[0]);
+        addEditor();
         
-      if(!start_time || start_time.getTime() + 1000 < new Date().getTime()) {
-        trigger_http_basic_auth(function() {
-          init();
-          $.adminDock.toggle();
-          start_time = null;
+        contentDecorator.addRemoveZone('#gallery');
+      
+        loadSnippet(snippetName, function(snippet) {
+          editor.setValue(snippet);
+          editor.refresh();
         });
+      
+        $('#gallery').trigger('refresh');
+        setTimeout(function() { $('#gallery').trigger('refresh'); },300);
+        setTimeout(function() { $('#gallery').trigger('refresh'); },600);
+        setTimeout(function() { $('#gallery').trigger('refresh'); },1200);
+        setTimeout(function() { $('#gallery').trigger('refresh'); },5000);
       }
+    
+      callback();
+    });
+  }
+  
+  function isCtrlOrAltEscape(event) {
+    return (event.altKey === true || event.ctrlKey === true ) && event.keyCode === 27;
+  }
+  
+  function isCtrlAltSpace(event) {
+    return event.altKey === true && event.ctrlKey === true && event.keyCode === 32;
+  }
+  
+  $(window).keydown(function(event) {
+    if (isCtrlOrAltEscape(event) || isCtrlAltSpace(event)) {        
+      init(function() {
+        $.adminDock.toggle();
+      });
     }
   });
   

data/app/assets/packages/burp/editing/js/markdown-fix.js

@@ -4,6 +4,12 @@
 
 (function() {
   
+  marked.setOptions({
+    gfm: true,
+    pedantic: false,
+    sanitize: false
+  });
+  
   function includeForMarkdown(element) {
     // Include text
     if(element.nodeType === 3) {
@@ -20,7 +26,7 @@
     $(nodes).each(function(index, element) {
       var last = newArray.length-1;
       if(includeForMarkdown(element)) {
-        var data = $("<div></div>").append(element).html();
+        var data = (element.nodeType === 3) ? element.data : $("<div></div>").append(element).html();
 
         if(typeof(newArray[last]) === 'string') {
           newArray[last] = newArray[last] + data;
@@ -34,6 +40,16 @@
     return newArray;
   }
 
+  function unwrapImagesFromParagraphs(container) {
+    container.find("p").each(function() {
+      if($(this).children().length === $(this).find('img').length) {
+        $(this).children().unwrap();
+      }
+    });
+    
+    return container;
+  }
+
   function toHtml(markdown) {
 
     var elements = [];
@@ -45,8 +61,8 @@
         elements.push(value);
       }
     });
-
-    return $("<div></div>").append(elements).html();
+    
+    return unwrapImagesFromParagraphs($("<div></div>").append(elements)).html();
   }
   
   window.markdown2Html = toHtml;

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

@@ -0,0 +1,59 @@
+(function(window,jQuery) {
+  
+  var $ = jQuery;
+  
+  window.snippets = function() {
+    
+    var snippets = {names:[],snippets:{}};
+    
+    var snippetComments = $("*:not(iframe)").contents().filter(function() {
+      try {
+        return this.nodeType === 8 && this.data.match(/snippet data-type=\"start\"/);
+      } catch (e) {
+        // Yay for not being allow to look at dom elements with external content, aka iframes
+        return false;
+      }
+    });
+    
+    snippetComments.map(function() {
+      
+      var name = this.data.match(/data-name=\"(.*?)\"/)[1];
+      var pageId = this.data.match(/data-page-id=\"(.*?)\"/)[1];
+      
+      snippets.names.push(name);
+      
+      snippets.snippets[name] = {
+        pageId:pageId,
+        comment:this,
+        elements:function() {
+          
+          var snippetElements = [];
+          var element = this.comment;
+          while(element.nextSibling) {
+            element = element.nextSibling;
+            if(element.nodeType === 8 && element.data.match(/snippet data-type=\"end\"/)) {
+              break;
+            }
+            snippetElements.push(element);
+          }
+          
+          return $(snippetElements);
+        },
+        update:function(newElements) {
+          this.elements().remove();
+          $(newElements).insertAfter(this.comment);
+        },
+        prepend:function(newElements) {
+          $(newElements).insertAfter(this.comment);
+        },
+        append:function(newElements) {
+          $(newElements).insertAfter(this.elements().last());
+        }
+        
+      };
+    });
+    
+    return snippets;
+  };
+  
+}(window,jQuery));

data/app/controllers/burp/files_controller.rb

@@ -25,12 +25,13 @@ module Burp
       if File.expand_path(file_path) != file_path
         render :text => "403, Forbiden!", :status => 403, :content_type => "text/plain"
       else
-        File.unlink(file_path)
+        File.unlink(file_path)  
+        Util.remove_all_versions_of_image(file_path)
       end
       
       Util.commit("Burp: removed a file")
       
-      redirect_to files_path
+      redirect_to files_path, notice: "#{File.basename(file_path)} has been removed."
     end
     
     def show

data/app/lib/burp/util.rb

@@ -5,21 +5,27 @@ require 'RMagick'
 module Burp
   module Util
   
+    SIZES = {:small => [200,300],:medium => [600,900], :large => [1000,1500]}
+  
     def self.commit(message = "auto commit", options = {})
       options[:path] ||= Burp.content_directory
       raise "missing git repo in burp cms directory" if `cd #{options[:path]}; git st 2>&1`.match(/Not a git repository/)
       `cd #{options[:path]}; git add .; git commit -a -m "Burp: #{message}"`
     end
     
+    def self.remove_all_versions_of_image(file_path)
+      SIZES.each_pair do |key,value|
+        target_path = "#{upload_directory_path}#{key.to_s}/#{File.basename(file_path)}"
+        File.unlink(target_path) if File.exist?(target_path)
+      end
+    end
+    
     def self.create_smaller_images(file_path)
       
-      upload_directory_path = "#{Burp.content_directory}uploads/"
-      
-      sizes = {:small => [200,300],:medium => [600,900], :large => [1000,1500]}
       image = Magick::ImageList.new(file_path).first
       image.auto_orient!
       
-      sizes.each_pair do |key,value|
+      SIZES.each_pair do |key,value|
         
         FileUtils.mkdir_p("#{upload_directory_path}#{key.to_s}")
         target_path = "#{upload_directory_path}#{key.to_s}/#{File.basename(file_path)}"
@@ -35,6 +41,11 @@ module Burp
       image.destroy!
     end
     
+    private
+    
+    def self.upload_directory_path
+      "#{Burp.content_directory}uploads/"
+    end
     
     
   end

data/lib/burp/engine.rb

@@ -12,7 +12,7 @@ module Burp
     # Enabling assets precompiling under rails 3.1
     if Rails.version >= '3.1'
       initializer :assets do |config|
-        Rails.application.config.assets.precompile += %w( burp/editing.css burp/editing.js burp/cms_helper.js)
+        Rails.application.config.assets.precompile += %w( burp/editing.css burp/editing.js burp/snippets.js)
       end
     end
     

data/lib/burp/version.rb

@@ -1,3 +1,3 @@
 module Burp
-  VERSION = "1.3.33"
+  VERSION = "1.4.0"
 end

data/lib/tasks/burp_tasks.rake

@@ -56,7 +56,7 @@ namespace :burp do
     end
     
     BurpRakeHelper.write('/app/assets/javascripts/burp.js') do |file|
-      file.write("// Includes burp related javascript.\n//\n//= require 'burp/editing'\n//= require 'burp/cms_helper'")
+      file.write("// Includes burp related javascript.\n//\n//= require 'burp/editing'\n//= require 'burp/snippets'")
     end
     
     BurpRakeHelper.write("/app/assets/stylesheets/burp.css") do |file|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: burp_cms
 version: !ruby/object:Gem::Version
-  version: 1.3.33
+  version: 1.4.0
 platform: ruby
 authors:
 - Darwin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-28 00:00:00.000000000 Z
+date: 2014-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jquery-rails
@@ -200,6 +200,8 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.markdown
 files:
+- LICENSE.txt
+- README.markdown
 - Rakefile
 - app/assets/images/burp/add-group-to-menu-1.png
 - app/assets/images/burp/add-group-to-menu-2.png
@@ -326,10 +328,12 @@ files:
 - app/assets/packages/burp/editing/dep/FontAwesome/less/font-awesome.less
 - app/assets/packages/burp/editing/js/admin-dock.js
 - app/assets/packages/burp/editing/js/content-decorator.js
+- app/assets/packages/burp/editing/js/disableJavascript.js
 - app/assets/packages/burp/editing/js/jquery.html2markdown.js
 - app/assets/packages/burp/editing/js/main.js
 - app/assets/packages/burp/editing/js/markdown-fix.js
 - app/assets/packages/burp/editing/js/marked.js
+- app/assets/packages/burp/editing/js/snippets.js
 - app/assets/packages/gritter/README.markdown
 - app/assets/packages/gritter/css/jquery.gritter.less
 - app/assets/packages/gritter/gritter.js
@@ -427,8 +431,6 @@ files:
 - lib/burp/version.rb
 - lib/burp_cms.rb
 - lib/tasks/burp_tasks.rake
-- LICENSE.txt
-- README.markdown
 homepage: http://github.com/bjornblomqvist/burp
 licenses:
 - LGPL3
@@ -449,7 +451,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A CMS that tries hard to not get in your way!