roojs-ui.js

[roojs1] / roojs-core-debug.js

diff --git a/roojs-core-debug.js b/roojs-core-debug.js
index 5f189dc..2329b66 100644 (file)
--- a/roojs-core-debug.js
+++ b/roojs-core-debug.js
@@ -16849,6 +16849,34 @@ Roo.Markdown.toHtml = function(text) {
         return self;
       };
     }
+
+
+         /**
+         * eval:var:noop
+    */
+    var noop = function () {}
+    noop.exec = noop;
+    
+         /**
+         * eval:var:merge
+    */
+    var merge = function (obj) {
+      var i = 1
+        , target
+        , key;
+    
+      for (; i < arguments.length; i++) {
+        target = arguments[i];
+        for (key in target) {
+          if (Object.prototype.hasOwnProperty.call(target, key)) {
+            obj[key] = target[key];
+          }
+        }
+      }
+    
+      return obj;
+    }
+    
     
     /**
      * Block-Level Grammar
@@ -17937,37 +17965,13 @@ Roo.Markdown.toHtml = function(text) {
       }
     };
   
-         /**
-         * eval:var:noop
-    */
-    var noop = function () {}
-    noop.exec = noop;
-    
-         /**
-         * eval:var:merge
-    */
-    var merge = function (obj) {
-      var i = 1
-        , target
-        , key;
-    
-      for (; i < arguments.length; i++) {
-        target = arguments[i];
-        for (key in target) {
-          if (Object.prototype.hasOwnProperty.call(target, key)) {
-            obj[key] = target[key];
-          }
-        }
-      }
-    
-      return obj;
-    }
-    
     
     /**
      * Marked
      */
-    
+         /**
+         * eval:var:marked
+    */
     var marked = function (src, opt, callback) {
       if (callback || typeof opt === 'function') {
         if (!callback) {
@@ -17989,7 +17993,9 @@ Roo.Markdown.toHtml = function(text) {
         }
     
         pending = tokens.length;
-    
+         /**
+         * eval:var:done
+    */
         var done = function(err) {
           if (err) {
             opt.highlight = highlight;