check ifdef for bootstrap version
authorAlan Knowles <alan@roojs.com>
Tue, 20 Aug 2019 09:56:35 +0000 (17:56 +0800)
committerAlan Knowles <alan@roojs.com>
Tue, 20 Aug 2019 09:56:35 +0000 (17:56 +0800)
Roo/bootstrap/version.js
roojs-bootstrap-debug.js
roojs-bootstrap.js

index 7d4b3cb..555a5ab 100644 (file)
@@ -7,7 +7,7 @@ Roo.bootstrap.version = (
         function() {
                 var ret=3;
                 Roo.each(document.styleSheets, function(s) {
         function() {
                 var ret=3;
                 Roo.each(document.styleSheets, function(s) {
-                    if (s.href.match(/css-bootstrap4/)) {
+                    if (typeof(s.href) != 'undefined' && s.href.match(/css-bootstrap4/)) {
                         ret=4;
                     }
                 });
                         ret=4;
                     }
                 });
index f155bf7..48a8ef5 100644 (file)
@@ -7,7 +7,7 @@ Roo.bootstrap.version = (
         function() {
                 var ret=3;
                 Roo.each(document.styleSheets, function(s) {
         function() {
                 var ret=3;
                 Roo.each(document.styleSheets, function(s) {
-                    if (s.href.match(/css-bootstrap4/)) {
+                    if (typeof(s.href) != 'undefined' && s.href.match(/css-bootstrap4/)) {
                         ret=4;
                     }
                 });
                         ret=4;
                     }
                 });
index d1d8833..df4a844 100644 (file)
@@ -1,5 +1,5 @@
 // Roo/bootstrap/version.js
 // Roo/bootstrap/version.js
-Roo.bootstrap.version=(function(){var A=3;Roo.each(document.styleSheets,function(s){if(s.href.match(/css-bootstrap4/)){A=4;}});return A;})();
+Roo.bootstrap.version=(function(){var A=3;Roo.each(document.styleSheets,function(s){if(typeof(s.href)!='undefined'&&s.href.match(/css-bootstrap4/)){A=4;}});return A;})();
 // Roo/bootstrap/Component.js
 Roo.bootstrap=Roo.bootstrap||{};Roo.bootstrap.Component=function(A){Roo.bootstrap.Component.superclass.constructor.call(this,A);this.addEvents({"childrenrendered":true});};Roo.extend(Roo.bootstrap.Component,Roo.BoxComponent,{allowDomMove:false,cls:false,style:false,autoCreate:false,tooltip:null,initEvents:function(){}
 ,xattr:false,parentId:false,can_build_overlaid:true,container_method:false,dataId:false,name:false,parent:function(){return Roo.ComponentMgr.get(this.parentId)},onRender:function(ct,A){Roo.bootstrap.Component.superclass.onRender.call(this,ct,A);if(this.el){if(this.el.attr('xtype')){this.el.attr('xtypex',this.el.attr('xtype'));
 // Roo/bootstrap/Component.js
 Roo.bootstrap=Roo.bootstrap||{};Roo.bootstrap.Component=function(A){Roo.bootstrap.Component.superclass.constructor.call(this,A);this.addEvents({"childrenrendered":true});};Roo.extend(Roo.bootstrap.Component,Roo.BoxComponent,{allowDomMove:false,cls:false,style:false,autoCreate:false,tooltip:null,initEvents:function(){}
 ,xattr:false,parentId:false,can_build_overlaid:true,container_method:false,dataId:false,name:false,parent:function(){return Roo.ComponentMgr.get(this.parentId)},onRender:function(ct,A){Roo.bootstrap.Component.superclass.onRender.call(this,ct,A);if(this.el){if(this.el.attr('xtype')){this.el.attr('xtypex',this.el.attr('xtype'));