roojs-core.js

[roojs1] / roojs-debug.js

diff --git a/roojs-debug.js b/roojs-debug.js
index b011669..afeb131 100644 (file)
--- a/roojs-debug.js
+++ b/roojs-debug.js
@@ -7124,6 +7124,7 @@ Roo.query = Roo.DomQuery.select;
  */
 
 Roo.util.Observable = function(cfg){
+    console.log("UTIL OBSERVABLE CONSTRUCTOR");
     
     cfg = cfg|| {};
     this.addEvents(cfg.events || {});
@@ -16865,6 +16866,7 @@ Roo.ComponentMgr = function(){
  * and is used as the component id.  Otherwise, it is assumed to be a standard config object and is applied to the component.
  */
 Roo.Component = function(config){
+    console.log("COMPONENT CONSTRUCTOR");
     config = config || {};
     if(config.tagName || config.dom || typeof config == "string"){ // element object
         config = {el: config, id: config.id || config};
@@ -46199,7 +46201,7 @@ Roo.extend(Roo.htmleditor.FilterWord, Roo.htmleditor.Filter,
             var kv = s.split(":");
              
             // what ever is left... we allow.
-            ret[kv[0]] = kv[1];
+            ret[kv[0].trim()] = kv[1];
         });
         return ret;
     },
@@ -46226,7 +46228,9 @@ Roo.extend(Roo.htmleditor.FilterWord, Roo.htmleditor.Filter,
         var ns = p,
             parent = p.parentNode,
             doc = parent.ownerDocument,
-            items = []; 
+            items = [];
+            
+            
         while (ns) {
             if (ns.nodeType != 1) {
                 ns = ns.nextSibling;
@@ -46237,15 +46241,16 @@ Roo.extend(Roo.htmleditor.FilterWord, Roo.htmleditor.Filter,
             }
             items.push(ns);
             ns = ns.nextSibling;
-            
         }
+        
+        
         var ul = parent.ownerDocument.createElement('ul'); // what about number lists...
         parent.insertBefore(ul, p);
         var lvl = 0;
         var stack = [ ul ];
         var last_li = false;
         
-        items.forEach(function(n) {
+        items.forEach(function(n, ipos) {
             //Roo.log("got innertHMLT=" + n.innerHTML);
             
             var spans = n.getElementsByTagName('span');
@@ -46277,18 +46282,15 @@ Roo.extend(Roo.htmleditor.FilterWord, Roo.htmleditor.Filter,
                 return;
             }
             
-            var nlvl = Math.min(
-                            stack.length-1, 
-                            (style['mso-list'].split(' ')[1].replace(/level/,'') *1) - 1
-                        );
+            var nlvl =   (style['mso-list'].split(' ')[1].replace(/level/,'') *1) - 1  ;
             
             
             
             if (nlvl > lvl) {
                 //new indent
-                    var nul = doc.createElement('ul'); // what about number lists...
-                    last_li.appendChild(nul);
-                    stack[nlvl] = nul;
+                var nul = doc.createElement('ul'); // what about number lists...
+                last_li.appendChild(nul);
+                stack[nlvl] = nul;
                 
             }
             lvl = nlvl;
@@ -55301,7 +55303,7 @@ Roo.extend(Roo.form.Layout, Roo.Component, {
      * a function which returns such a specification.
      */
     /**
-     * @cfg {String} labelAlign
+     * @cfg {String} labelAlign (left|top|right)
      * Valid values are "left," "top" and "right" (defaults to "left")
      */
     /**
@@ -55421,6 +55423,7 @@ Roo.extend(Roo.form.Layout, Roo.Component, {
     }
 });
 
+
 /**
  * @class Roo.form.Column
  * @extends Roo.form.Layout
@@ -55455,7 +55458,6 @@ Roo.extend(Roo.form.Column, Roo.form.Layout, {
     }
 });
 
-
 /**
  * @class Roo.form.Row
  * @extends Roo.form.Layout