From 405704c45feb8165614b274cf3797b4e1291dd45 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Thu, 17 Sep 2020 13:58:38 +0800 Subject: [PATCH] fix typo --- Roo/bootstrap/Card.js | 3 +- examples/bootstrap/dashboard4.bjs | 222 +++++++++------------- examples/bootstrap/dashboard4.js | 303 ++++++++++++------------------ roojs-bootstrap-debug.js | 4 +- roojs-bootstrap.js | 14 +- 5 files changed, 221 insertions(+), 325 deletions(-) diff --git a/Roo/bootstrap/Card.js b/Roo/bootstrap/Card.js index 6c384b3116..08f1a95261 100644 --- a/Roo/bootstrap/Card.js +++ b/Roo/bootstrap/Card.js @@ -232,4 +232,5 @@ Roo.extend(Roo.bootstrap.Card, Roo.bootstrap.Component, { return this.el.select('.roo-card-body-ctr',true).first(); } -} \ No newline at end of file +}); + diff --git a/examples/bootstrap/dashboard4.bjs b/examples/bootstrap/dashboard4.bjs index 1ccc0604c0..aaa1d28228 100644 --- a/examples/bootstrap/dashboard4.bjs +++ b/examples/bootstrap/dashboard4.bjs @@ -11,7 +11,6 @@ "0d61f8370cad1d412f80b84d143e1257" : "C", "f623e75af30e62bbd73d6df5b50bb7b5" : "D", "3a3ea00cfc35332cedf6e5e9a32e94da" : "E", - "30bd2ce65d1e43e9c498b7d5d49f3b78" : "Dashboard Example Control panel ", "70ce2e7a27cab2a670ca954f8362e19f" : "tab 2 content", "800618943025315f869e4e1f09471012" : "F", "18327168fcb401af02b4615b43d637ad" : "Pick from list", @@ -24,160 +23,117 @@ "$ xns" : "Roo.bootstrap", "items" : [ { - "String cls" : "header", - "tag" : "header", + "String tag" : "section", + "String cls" : "content", "xtype" : "Container", - "* xinclude" : "Dashboard.Header1", - "$ xns" : "Roo.bootstrap" - }, - { - "String cls" : "wrapper row-offcanvas row-offcanvas-left", - "xtype" : "Container", - "flexy:include" : "Sidebar.html", "$ xns" : "Roo.bootstrap", "items" : [ { - "String tag" : "aside", - "String cls" : "left-side sidebar-offcanvas", - "xtype" : "Container", - "* xinclude" : "Dashboard.Sidebar2", - "$ xns" : "Roo.bootstrap" - }, - { - "String tag" : "aside", - "String cls" : "right-side", - "xtype" : "Container", + "xtype" : "Row", "$ xns" : "Roo.bootstrap", "items" : [ { - "String tag" : "section", - "String cls" : "content-header", - "xtype" : "Container", + "Number md" : 6, + "Number lg" : 6, + "xtype" : "Column", "$ xns" : "Roo.bootstrap", + "String style" : "", + "Number sm" : 12, "items" : [ { - "xtype" : "Header", - "$ xns" : "Roo.bootstrap", - "String html" : "Dashboard Example Control panel " - } - ] - }, - { - "String tag" : "section", - "String cls" : "content", - "xtype" : "Container", - "$ xns" : "Roo.bootstrap", - "items" : [ - { - "xtype" : "Row", - "$ xns" : "Roo.bootstrap", + "listeners" : { + "render" : "function (_self)\n{\n _this.testbox = _self;\n}" + }, + "xtype" : "TabBox", + "$ xns" : "Roo.bootstrap.dash", + "String title" : "Pick from list", "items" : [ { - "Number md" : 6, - "Number lg" : 6, - "xtype" : "Column", - "$ xns" : "Roo.bootstrap", - "String style" : "", - "Number sm" : 12, + "xtype" : "TabPane", + "$ xns" : "Roo.bootstrap.dash", + "string title" : "A", "items" : [ { - "listeners" : { - "render" : "function (_self)\n{\n _this.testbox = _self;\n}" - }, - "xtype" : "TabBox", - "$ xns" : "Roo.bootstrap.dash", - "String title" : "Pick from list", + "xtype" : "Column", + "$ xns" : "Roo.bootstrap", "items" : [ { - "xtype" : "TabPane", - "$ xns" : "Roo.bootstrap.dash", - "string title" : "A", - "items" : [ - { - "xtype" : "Column", - "$ xns" : "Roo.bootstrap", - "items" : [ - { - "String size" : "sm", - "String weight" : "warning", - "xtype" : "Button", - "$ xns" : "Roo.bootstrap", - "String html" : "Some text" - }, - { - "String size" : "sm", - "String weight" : "warning", - "xtype" : "Button", - "$ xns" : "Roo.bootstrap", - "String html" : "Some text" - } - ] - } - ] - }, - { - "xtype" : "TabPane", - "$ xns" : "Roo.bootstrap.dash", - "string title" : "B", - "items" : [ - { - "xtype" : "Column", - "$ xns" : "Roo.bootstrap", - "String html" : "tab 2 content" - } - ] + "String size" : "sm", + "String weight" : "warning", + "xtype" : "Button", + "$ xns" : "Roo.bootstrap", + "String html" : "Some text" }, { - "xtype" : "TabPane", - "$ xns" : "Roo.bootstrap.dash", - "string title" : "C", - "items" : [ - { - "xtype" : "Column", - "$ xns" : "Roo.bootstrap", - "String html" : "tab 2 content" - } - ] - }, - { - "xtype" : "TabPane", - "$ xns" : "Roo.bootstrap.dash", - "string title" : "D", - "items" : [ - { - "xtype" : "Column", - "$ xns" : "Roo.bootstrap", - "String html" : "tab 2 content" - } - ] - }, - { - "xtype" : "TabPane", - "$ xns" : "Roo.bootstrap.dash", - "string title" : "E", - "items" : [ - { - "xtype" : "Column", - "$ xns" : "Roo.bootstrap", - "String html" : "tab 2 content" - } - ] - }, - { - "xtype" : "TabPane", - "$ xns" : "Roo.bootstrap.dash", - "string title" : "F", - "items" : [ - { - "xtype" : "Column", - "$ xns" : "Roo.bootstrap", - "String html" : "tab 2 content" - } - ] + "String size" : "sm", + "String weight" : "warning", + "xtype" : "Button", + "$ xns" : "Roo.bootstrap", + "String html" : "Some text" } ] } ] + }, + { + "xtype" : "TabPane", + "$ xns" : "Roo.bootstrap.dash", + "string title" : "B", + "items" : [ + { + "xtype" : "Column", + "$ xns" : "Roo.bootstrap", + "String html" : "tab 2 content" + } + ] + }, + { + "xtype" : "TabPane", + "$ xns" : "Roo.bootstrap.dash", + "string title" : "C", + "items" : [ + { + "xtype" : "Column", + "$ xns" : "Roo.bootstrap", + "String html" : "tab 2 content" + } + ] + }, + { + "xtype" : "TabPane", + "$ xns" : "Roo.bootstrap.dash", + "string title" : "D", + "items" : [ + { + "xtype" : "Column", + "$ xns" : "Roo.bootstrap", + "String html" : "tab 2 content" + } + ] + }, + { + "xtype" : "TabPane", + "$ xns" : "Roo.bootstrap.dash", + "string title" : "E", + "items" : [ + { + "xtype" : "Column", + "$ xns" : "Roo.bootstrap", + "String html" : "tab 2 content" + } + ] + }, + { + "xtype" : "TabPane", + "$ xns" : "Roo.bootstrap.dash", + "string title" : "F", + "items" : [ + { + "xtype" : "Column", + "$ xns" : "Roo.bootstrap", + "String html" : "tab 2 content" + } + ] } ] } diff --git a/examples/bootstrap/dashboard4.js b/examples/bootstrap/dashboard4.js index ca786f17e6..2bbba6594a 100644 --- a/examples/bootstrap/dashboard4.js +++ b/examples/bootstrap/dashboard4.js @@ -10,7 +10,6 @@ dashboard4 = new Roo.XComponent({ '0d61f8370cad1d412f80b84d143e1257' :"C", 'f623e75af30e62bbd73d6df5b50bb7b5' :"D", '3a3ea00cfc35332cedf6e5e9a32e94da' :"E", - '30bd2ce65d1e43e9c498b7d5d49f3b78' :"Dashboard Example Control panel ", '70ce2e7a27cab2a670ca954f8362e19f' :"tab 2 content", '800618943025315f869e4e1f09471012' :"F", '18327168fcb401af02b4615b43d637ad' :"Pick from list", @@ -24,220 +23,158 @@ dashboard4 = new Roo.XComponent({ name : "unnamed module", disabled : false, permname : '', - _tree : function() + _tree : function(_data) { var _this = this; var MODULE = this; return { - '|xns' : 'Roo.bootstrap', + xtype : 'Body', cls : 'skin-blue', xns : Roo.bootstrap, - xtype : 'Body', - items : [ - Roo.apply(Dashboard.Header1._tree(), { - '|xns' : 'Roo.bootstrap', - cls : 'header', - tag : 'header', - xns : Roo.bootstrap, - xtype : 'Container' - }), + '|xns' : 'Roo.bootstrap', + items : [ { - '|xns' : 'Roo.bootstrap', - cls : 'wrapper row-offcanvas row-offcanvas-left', - 'flexy:include' : 'Sidebar.html', - xns : Roo.bootstrap, xtype : 'Container', - items : [ - Roo.apply(Dashboard.Sidebar2._tree(), { - '|xns' : 'Roo.bootstrap', - cls : 'left-side sidebar-offcanvas', - tag : 'aside', - xns : Roo.bootstrap, - xtype : 'Container' - }), + cls : 'content', + tag : 'section', + xns : Roo.bootstrap, + '|xns' : 'Roo.bootstrap', + items : [ { - '|xns' : 'Roo.bootstrap', - cls : 'right-side', - tag : 'aside', + xtype : 'Row', xns : Roo.bootstrap, - xtype : 'Container', - items : [ + '|xns' : 'Roo.bootstrap', + items : [ { - '|xns' : 'Roo.bootstrap', - cls : 'content-header', - tag : 'section', + xtype : 'Column', + lg : 6, + md : 6, + sm : 12, + style : '', xns : Roo.bootstrap, - xtype : 'Container', - items : [ - { - '|xns' : 'Roo.bootstrap', - html : _this._strings['30bd2ce65d1e43e9c498b7d5d49f3b78'], - xns : Roo.bootstrap, - xtype : 'Header' - } - ] - - }, - { '|xns' : 'Roo.bootstrap', - cls : 'content', - tag : 'section', - xns : Roo.bootstrap, - xtype : 'Container', - items : [ + items : [ { - '|xns' : 'Roo.bootstrap', - xns : Roo.bootstrap, - xtype : 'Row', - items : [ + xtype : 'TabBox', + title : _this._strings['18327168fcb401af02b4615b43d637ad'] /* Pick from list */, + listeners : { + render : function (_self) + { + _this.testbox = _self; + } + }, + xns : Roo.bootstrap.dash, + '|xns' : 'Roo.bootstrap.dash', + items : [ { - '|xns' : 'Roo.bootstrap', - lg : 6, - md : 6, - sm : 12, - style : '', - xns : Roo.bootstrap, - xtype : 'Column', - items : [ + xtype : 'TabPane', + title : _this._strings['7fc56270e7a70fa81a5935b72eacbe29'] /* A */, + xns : Roo.bootstrap.dash, + '|xns' : 'Roo.bootstrap.dash', + items : [ { - '|xns' : 'Roo.bootstrap.dash', - title : _this._strings['18327168fcb401af02b4615b43d637ad'], - xns : Roo.bootstrap.dash, - xtype : 'TabBox', - listeners : { - render : function (_self) - { - _this.testbox = _self; - } - }, - items : [ - { - '|xns' : 'Roo.bootstrap.dash', - title : _this._strings['7fc56270e7a70fa81a5935b72eacbe29'], - xns : Roo.bootstrap.dash, - xtype : 'TabPane', - items : [ - { - '|xns' : 'Roo.bootstrap', - xns : Roo.bootstrap, - xtype : 'Column', - items : [ - { - '|xns' : 'Roo.bootstrap', - html : _this._strings['9db5682a4d778ca2cb79580bdb67083f'], - size : 'sm', - weight : 'warning', - xns : Roo.bootstrap, - xtype : 'Button' - }, - { - '|xns' : 'Roo.bootstrap', - html : _this._strings['9db5682a4d778ca2cb79580bdb67083f'], - size : 'sm', - weight : 'warning', - xns : Roo.bootstrap, - xtype : 'Button' - } - ] - - } - ] - - }, - { - '|xns' : 'Roo.bootstrap.dash', - title : _this._strings['9d5ed678fe57bcca610140957afab571'], - xns : Roo.bootstrap.dash, - xtype : 'TabPane', - items : [ - { - '|xns' : 'Roo.bootstrap', - html : _this._strings['70ce2e7a27cab2a670ca954f8362e19f'], - xns : Roo.bootstrap, - xtype : 'Column' - } - ] - - }, + xtype : 'Column', + xns : Roo.bootstrap, + '|xns' : 'Roo.bootstrap', + items : [ { - '|xns' : 'Roo.bootstrap.dash', - title : _this._strings['0d61f8370cad1d412f80b84d143e1257'], - xns : Roo.bootstrap.dash, - xtype : 'TabPane', - items : [ - { - '|xns' : 'Roo.bootstrap', - html : _this._strings['70ce2e7a27cab2a670ca954f8362e19f'], - xns : Roo.bootstrap, - xtype : 'Column' - } - ] - - }, - { - '|xns' : 'Roo.bootstrap.dash', - title : _this._strings['f623e75af30e62bbd73d6df5b50bb7b5'], - xns : Roo.bootstrap.dash, - xtype : 'TabPane', - items : [ - { - '|xns' : 'Roo.bootstrap', - html : _this._strings['70ce2e7a27cab2a670ca954f8362e19f'], - xns : Roo.bootstrap, - xtype : 'Column' - } - ] - + xtype : 'Button', + html : _this._strings['9db5682a4d778ca2cb79580bdb67083f'] /* Some text */, + size : 'sm', + weight : 'warning', + xns : Roo.bootstrap, + '|xns' : 'Roo.bootstrap' }, { - '|xns' : 'Roo.bootstrap.dash', - title : _this._strings['3a3ea00cfc35332cedf6e5e9a32e94da'], - xns : Roo.bootstrap.dash, - xtype : 'TabPane', - items : [ - { - '|xns' : 'Roo.bootstrap', - html : _this._strings['70ce2e7a27cab2a670ca954f8362e19f'], - xns : Roo.bootstrap, - xtype : 'Column' - } - ] - - }, - { - '|xns' : 'Roo.bootstrap.dash', - title : _this._strings['800618943025315f869e4e1f09471012'], - xns : Roo.bootstrap.dash, - xtype : 'TabPane', - items : [ - { - '|xns' : 'Roo.bootstrap', - html : _this._strings['70ce2e7a27cab2a670ca954f8362e19f'], - xns : Roo.bootstrap, - xtype : 'Column' - } - ] - + xtype : 'Button', + html : _this._strings['9db5682a4d778ca2cb79580bdb67083f'] /* Some text */, + size : 'sm', + weight : 'warning', + xns : Roo.bootstrap, + '|xns' : 'Roo.bootstrap' } ] - } ] - + }, + { + xtype : 'TabPane', + title : _this._strings['9d5ed678fe57bcca610140957afab571'] /* B */, + xns : Roo.bootstrap.dash, + '|xns' : 'Roo.bootstrap.dash', + items : [ + { + xtype : 'Column', + html : _this._strings['70ce2e7a27cab2a670ca954f8362e19f'] /* tab 2 content */, + xns : Roo.bootstrap, + '|xns' : 'Roo.bootstrap' + } + ] + }, + { + xtype : 'TabPane', + title : _this._strings['0d61f8370cad1d412f80b84d143e1257'] /* C */, + xns : Roo.bootstrap.dash, + '|xns' : 'Roo.bootstrap.dash', + items : [ + { + xtype : 'Column', + html : _this._strings['70ce2e7a27cab2a670ca954f8362e19f'] /* tab 2 content */, + xns : Roo.bootstrap, + '|xns' : 'Roo.bootstrap' + } + ] + }, + { + xtype : 'TabPane', + title : _this._strings['f623e75af30e62bbd73d6df5b50bb7b5'] /* D */, + xns : Roo.bootstrap.dash, + '|xns' : 'Roo.bootstrap.dash', + items : [ + { + xtype : 'Column', + html : _this._strings['70ce2e7a27cab2a670ca954f8362e19f'] /* tab 2 content */, + xns : Roo.bootstrap, + '|xns' : 'Roo.bootstrap' + } + ] + }, + { + xtype : 'TabPane', + title : _this._strings['3a3ea00cfc35332cedf6e5e9a32e94da'] /* E */, + xns : Roo.bootstrap.dash, + '|xns' : 'Roo.bootstrap.dash', + items : [ + { + xtype : 'Column', + html : _this._strings['70ce2e7a27cab2a670ca954f8362e19f'] /* tab 2 content */, + xns : Roo.bootstrap, + '|xns' : 'Roo.bootstrap' + } + ] + }, + { + xtype : 'TabPane', + title : _this._strings['800618943025315f869e4e1f09471012'] /* F */, + xns : Roo.bootstrap.dash, + '|xns' : 'Roo.bootstrap.dash', + items : [ + { + xtype : 'Column', + html : _this._strings['70ce2e7a27cab2a670ca954f8362e19f'] /* tab 2 content */, + xns : Roo.bootstrap, + '|xns' : 'Roo.bootstrap' + } + ] } ] - } ] - } ] - } ] - } ] - }; } }); diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js index deff70db21..324d160116 100644 --- a/roojs-bootstrap-debug.js +++ b/roojs-bootstrap-debug.js @@ -1721,7 +1721,9 @@ Roo.extend(Roo.bootstrap.Card, Roo.bootstrap.Component, { return this.el.select('.roo-card-body-ctr',true).first(); } -}/* +}); + +/* * - LGPL * * image diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js index aa5b353f37..a9da16f88b 100644 --- a/roojs-bootstrap.js +++ b/roojs-bootstrap.js @@ -60,13 +60,13 @@ return this.el.select('.panel-body',true).first()},titleEl:function(){if(!this.e },getTitle:function(){var A=this.titleEl();if(!A){return '';}return A.dom.innerHTML;},setRightTitle:function(v){var t=this.el.select('.panel-header-right',true).first();if(!t){return;}t.dom.innerHTML=v;},onClick:function(e){e.preventDefault();this.fireEvent('click',this,e); }}); // Roo/bootstrap/Card.js -Roo.bootstrap.Card=function(A){Roo.bootstrap.Card.superclass.constructor.call(this,A);this.addEvents({});};Roo.extend(Roo.bootstrap.Card,Roo.bootstrap.Component,{weight:'',margin:'',margin_top:'',margin_bottom:'',margin_left:'',margin_right:'',margin_x:'',margin_y:'',padding:'',padding_top:'',padding_bottom:'',padding_left:'',padding_right:'',padding_x:'',padding_y:'',display:'',display_xs:'',display_sm:'',display_lg:'',display_xl:'',header_image:'',header:'',header_size:0,title:'',subtitle:'',html:'',childContainer:false,layoutCls:function(){var cls=''; -var t=this;['','top','bottom','left','right','x','y'].forEach(function(v){if(t['margin'+(v.length?'_':'')+v].length){cls+=' m'+(v.length?v[0]:'')+'-'+t['margin'+(v.length?'_':'')+v];}if(t['padding'+(v.length?'_':'')+v].length){cls+=' p'+(v.length?v[0]:'')+'-'+t['padding'+(v.length?'_':'')+v]; -}});['','xs','sm','lg','xl'].forEach(function(v){if(t['display'+(v.length?'_':'')+v].length){cls+=' d'+(v.length?'-':'')+v+'-'+t['margin'+(v.length?'_':'')+v].length}});if(this.hidden){cls+=' d-none';}return cls;},getAutoCreate:function(){var cfg={tag:'div',cls:'card',cn:[]} -;if(this.weight.length&&this.weight!='light'){cfg.cls+=' text-white'}if(this.weight.length){cfg.cls+=' bg-'+this.weight;}cfg.cls+=this.layoutCls();if(this.header.length){cfg.cn.push({tag:this.header_size>0?'h'+this.header_size:'div',cls:'card-header',html:this.header} -);}if(this.header_image.length){cfg.cn.push({tag:'img',cls:'card-img-top',src:this.header_image});}var body={tag:'div',cls:'card-body',cn:[]};cfg.push(body);if(this.title.length){body.cn.push({tag:'div',cls:'card-title',src:this.title});}if(this.subtitle.length){body.cn.push({tag:'div',cls:'card-title',src:this.subtitle} -);}body.cn.push({tag:'div',cls:'roo-card-body-ctr'});if(this.footer.length){body.cn.push({tag:'div',cls:'card-footer',html:this.footer});}return cfg;},getChildContainer:function(){if(!this.el){return false;}return this.el.select('.roo-card-body-ctr',true).first(); -}} +Roo.bootstrap.Card=function(A){Roo.bootstrap.Card.superclass.constructor.call(this,A);this.addEvents({});};Roo.extend(Roo.bootstrap.Card,Roo.bootstrap.Component,{weight:'',margin:'',margin_top:'',margin_bottom:'',margin_left:'',margin_right:'',margin_x:'',margin_y:'',padding:'',padding_top:'',padding_bottom:'',padding_left:'',padding_right:'',padding_x:'',padding_y:'',display:'',display_xs:'',display_sm:'',display_lg:'',display_xl:'',header_image:'',header:'',header_size:0,title:'',subtitle:'',html:'',childContainer:false,layoutCls:function(){var A=''; +var t=this;['','top','bottom','left','right','x','y'].forEach(function(v){if(t['margin'+(v.length?'_':'')+v].length){A+=' m'+(v.length?v[0]:'')+'-'+t['margin'+(v.length?'_':'')+v];}if(t['padding'+(v.length?'_':'')+v].length){A+=' p'+(v.length?v[0]:'')+'-'+t['padding'+(v.length?'_':'')+v]; +}});['','xs','sm','lg','xl'].forEach(function(v){if(t['display'+(v.length?'_':'')+v].length){A+=' d'+(v.length?'-':'')+v+'-'+t['margin'+(v.length?'_':'')+v].length}});if(this.hidden){A+=' d-none';}return A;},getAutoCreate:function(){var A={tag:'div',cls:'card',cn:[]} +;if(this.weight.length&&this.weight!='light'){A.cls+=' text-white'}if(this.weight.length){A.cls+=' bg-'+this.weight;}A.cls+=this.layoutCls();if(this.header.length){A.cn.push({tag:this.header_size>0?'h'+this.header_size:'div',cls:'card-header',html:this.header} +);}if(this.header_image.length){A.cn.push({tag:'img',cls:'card-img-top',src:this.header_image});}var B={tag:'div',cls:'card-body',cn:[]};A.push(B);if(this.title.length){B.cn.push({tag:'div',cls:'card-title',src:this.title});}if(this.subtitle.length){B.cn.push({tag:'div',cls:'card-title',src:this.subtitle} +);}B.cn.push({tag:'div',cls:'roo-card-body-ctr'});if(this.footer.length){B.cn.push({tag:'div',cls:'card-footer',html:this.footer});}return A;},getChildContainer:function(){if(!this.el){return false;}return this.el.select('.roo-card-body-ctr',true).first(); +}}); // Roo/bootstrap/Img.js Roo.bootstrap.Img=function(A){Roo.bootstrap.Img.superclass.constructor.call(this,A);this.addEvents({"click":true});};Roo.extend(Roo.bootstrap.Img,Roo.bootstrap.Component,{imgResponsive:true,border:'',src:'about:blank',href:false,target:false,xsUrl:'',smUrl:'',mdUrl:'',lgUrl:'',getAutoCreate:function(){if(this.src||(!this.xsUrl&&!this.smUrl&&!this.mdUrl&&!this.lgUrl)){return this.createSingleImg(); }var A={tag:'div',cls:'roo-image-responsive-group',cn:[]};var B=this;Roo.each(['xs','sm','md','lg'],function(C){if(!B[C+'Url']){return;}var D={tag:'img',cls:(B.imgResponsive)?'img-responsive':'',html:B.html||A.html,src:B[C+'Url']};D.cls+=' roo-image-responsive-'+C; -- 2.39.2