burp_cms 1.5.5 → 1.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c13ef9c316a9bca2ecfc2a1fbfa50708ecb86a0
-  data.tar.gz: cc7daabdc05dbd01a448bccbae0dd740732a01f6
+  metadata.gz: 5056e14bbfa659de799cfc6b68446377eccfd0c0
+  data.tar.gz: d3911f893c4b6c20c82b1bf13ee8e7c552ac1429
 SHA512:
-  metadata.gz: 6c9fb18edc49829ca6289270e20ac120dc264fa9936d573be52915722d931857ff621a56e44e260f55678371de6d8a845fced3fb27f89509706bf9612c597fd6
-  data.tar.gz: 52d1196315a1215cafc2cf7226d25dc1eae48d029ca69c296901ae61e3572df260a40e7b7a379f904273a02b47ae602b4e76ccb7a3f6d827ab9e81a7f2cc76c2
+  metadata.gz: 850cd9d7c07654d0e43822b0002b6bba74619043b7457dbfc49a963d4907214a1a332b3769967e5c1bd0b2e563da7757874799563f20a1f537cb7d0f8f130689
+  data.tar.gz: 69bae840ea3a77d5740f272c88b85b964e5ae4c0ed888f02bd83a7ae2f1d2f5330481e6b665e5ac412572af0729653a4d9630d0e190fdf6891289a8b61c92f49

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

@@ -6,7 +6,7 @@ $(function() {
   
   var elements = $('<div style="display: none;"><div id="gallery" style="display: none;"><ul class="images"></ul><i class="prev icon-large enabled icon-caret-left"></i><i class="next icon-large enabled icon-caret-right"></i></div><div id="myContentEditor" style="display: none;"><textarea id="code" style="width: 100%; height: 300px;"></textarea></div></div>');
   var lastValue;
-  var snippetName;
+  var current_snippetName;
   var originalHtml;
   var originalValue;
   var contentDecorator;
@@ -23,14 +23,12 @@ $(function() {
   
   var snippetCache = {};
   
-  function getHTMLForSnippet(_snippetName, callback) {
+  function getHTMLForSnippet(snippetName, callback) {
     var path = getPathFor(snippetName);
     
-    var cacheKey = path + _snippetName;
+    var cacheKey = path + snippetName;
     if(snippetCache[cacheKey]) {
-      setTimeout(function() {
-        callback(snippetCache[cacheKey]);
-      }, 0);
+      callback(snippetCache[cacheKey]);
     } else {    
       $.ajax("/burp/pages/"+path,{
          cache:false,
@@ -56,6 +54,7 @@ $(function() {
      if(snippetEditorState[snippetName]) {
         callback(snippetEditorState[snippetName]);
      } else {
+       
        getHTMLForSnippet(snippetName, function(html) {
 
           var element = $("<div>" + html + "</div>");
@@ -108,13 +107,13 @@ $(function() {
   
   function selectSnippet(_snippetName) {
 
-    snippetName = _snippetName;
-    loadSnippet(snippetName, function(snippet) {
+    current_snippetName = _snippetName;
+    loadSnippet(current_snippetName, function(snippet) {
       editor.setValue(snippet);
       editor.refresh();
     });
     
-    contentDecorator.setSnippetName(snippetName);
+    contentDecorator.setSnippetName(current_snippetName);
   }
   
   function removeIDs(elements) {
@@ -152,6 +151,7 @@ $(function() {
     var elements = burp.disableScriptElements($(html));
     elements = addIDs(snippetName, elements);
     domSnippetState[snippetName] = elements.clone();
+    
     snippets().snippets[snippetName].update(elements);
     
     contentDecorator.makeDroppable(elements.filter("img"), false);
@@ -179,12 +179,12 @@ $(function() {
           if(timeToWait > 0) {
             timeoutID = setTimeout(function() {
               timeoutID = undefined;
-              snippetEditorState[snippetName] = editor.getValue();
-              updateSnippetWithMarkdown(snippetName, snippetEditorState[snippetName]);
+              snippetEditorState[current_snippetName] = editor.getValue();
+              updateSnippetWithMarkdown(current_snippetName, snippetEditorState[current_snippetName]);
             }, timeToWait);
           } else {
-            snippetEditorState[snippetName] = editor.getValue();
-            updateSnippetWithMarkdown(snippetName, snippetEditorState[snippetName]);
+            snippetEditorState[current_snippetName] = editor.getValue();
+            updateSnippetWithMarkdown(current_snippetName, snippetEditorState[current_snippetName]);
           }
         }
       }
@@ -238,7 +238,7 @@ $(function() {
         change: function(option) {
         
           selectSnippet(option);
-          loadSnippet(snippetName, function(snippet) {
+          loadSnippet(current_snippetName, function(snippet) {
             editor.setValue(snippet);
             editor.refresh();
           });
@@ -284,7 +284,7 @@ $(function() {
         });
       });
       
-      loadSnippet(snippetName, function(snippet) {
+      loadSnippet(current_snippetName, function(snippet) {
         editor.setValue(snippet);
         editor.refresh();
       });
@@ -433,7 +433,7 @@ $(function() {
         
         contentDecorator.addRemoveZone('#gallery');
       
-        loadSnippet(snippetName, function(snippet) {
+        loadSnippet(current_snippetName, function(snippet) {
           editor.setValue(snippet);
           editor.refresh();
         });

data/lib/burp/version.rb

@@ -1,3 +1,3 @@
 module Burp
-  VERSION = "1.5.5" 
+  VERSION = "1.5.6" 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: burp_cms
 version: !ruby/object:Gem::Version
-  version: 1.5.5
+  version: 1.5.6
 platform: ruby
 authors:
 - Darwin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-13 00:00:00.000000000 Z
+date: 2014-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jquery-rails