php7 fixes

[Pman.Builder] / Pman.Builder.View.js

diff --git a/Pman.Builder.View.js b/Pman.Builder.View.js
index 6578f43..055d9b8 100644 (file)
--- a/Pman.Builder.View.js
+++ b/Pman.Builder.View.js
@@ -44,7 +44,7 @@ Pman.Builder.View = {
         this.container.setContent(
                 '<iframe width="100%" height="100%" src="'+baseURL+'/Builder/App/' + app + '?no_parts=1"></iframe>'
         );
-        var iframe = this.container.el.select('iframe',true).first()
+        var iframe = this.container.el.select('iframe',true).first();
         
         iframe.setSize( this.panel.el.getSize());
         
@@ -95,6 +95,11 @@ Pman.Builder.View = {
                 return;
             
             }
+            if(nodeName == 'BR'){
+                cb("<BR/>");
+                return;
+            }
+            
             var i = 0;
           // Prints the node tagName, such as <A>, <IMG>, etc
             if (tagName) {
@@ -245,9 +250,15 @@ Pman.Builder.View = {
         
         // add xattr data?
         if (add_xattr) {
-            cfg.xattr = {
-                xtype : cfg['|xns'] + '.' + cfg.xtype 
-            };
+            
+            if(typeof(cfg.xattr) != 'undefined'){
+                
+                cfg.xattr.xtype = cfg['|xns'] + '.' + cfg.xtype;
+            }else{
+                cfg.xattr = {
+                    xtype : cfg['|xns'] + '.' + cfg.xtype 
+                };
+            }
             
         }
         
@@ -401,26 +412,20 @@ Pman.Builder.View = {
         }
         if (cfg.items[0]['|xns'] == 'Roo.bootstrap') {
             
-            Roo.log('----------------------------run draw----------------------------');
-//            Roo.log(cfg.items[0]);return;
-            // if xtype = 'modal...'
-             // construct the modal..
-             // and show it..
             if (cfg.items[0].xtype =='Modal' ) {
-                
+                this.bootstrapModal = Roo.factory(cfg.items[0]);
+                this.bootstrapModal.show();
+                return;
             }
-            
             Roo.log("bootstrap build!?");
             var top = new Roo.bootstrap.Body({});
             top.onRender(false,false);
             
-            this.bootstrapModal = top.addxtype(cfg.items[0]).items[0];
+            this.bootstrapModal = top.addxtype(cfg.items[0]);
             
             this.applyFlexy(top);
             
-            if (cfg.items[0].xtype =='Modal' ) {
-                this.bootstrapModal.show();
-            }
+            
             
             return;
         }
@@ -461,7 +466,7 @@ Pman.Builder.View = {
             if (!e.dom.href.match(/bootstrap\.\min.css$/)) {
                 return;
             }
-            e.dom.setAttribute('href', rootURL +'/bootswatch/' + name + '/bootstrap.min.css' );
+            e.dom.setAttribute('href', rootURL +'/themes/' + name + '/bootstrap.min.css' );
             
         
        });
@@ -475,6 +480,9 @@ Pman.Builder.View = {
         if (typeof(tree['flexy:if']) != 'undefined') {
             tree.el.attr('flexy:if', tree['flexy:if']);
         }
+        if (typeof(tree['flexy:nameuses']) != 'undefined') {
+            (tree.inputEl() !== 'undefined') ? tree.inputEl().attr('flexy:nameuses', tree['flexy:nameuses']) : tree.el.attr('flexy:nameuses', tree['flexy:nameuses']);
+        }
         if (!tree.items || !tree.items.length) { return; }
         
         for (var i = 0; i < tree.items.length; i++){