From 58086923568ba2a17618e03fa4bd1f193094f812 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Fri, 9 Sep 2016 14:29:17 +0800 Subject: [PATCH] Roo/doc/Example.js roojs-doc.js roojs-doc-debug.js --- Roo/doc/Example.js | 2 +- roojs-doc-debug.js | 50 ++++++++++++++++++++++++++++++++++++++-------- roojs-doc.js | 9 +++++---- 3 files changed, 48 insertions(+), 13 deletions(-) diff --git a/Roo/doc/Example.js b/Roo/doc/Example.js index b7d20d0688..3295976c43 100644 --- a/Roo/doc/Example.js +++ b/Roo/doc/Example.js @@ -38,7 +38,7 @@ Roo.extend(Roo.doc.Example, Roo.bootstrap.Component, { cn : [ { cls : 'panel-heading', - html : this.title, + html : this.title }, { cls : 'panel-body', diff --git a/roojs-doc-debug.js b/roojs-doc-debug.js index 6dc04de634..736f7a23c2 100644 --- a/roojs-doc-debug.js +++ b/roojs-doc-debug.js @@ -101,8 +101,10 @@ Roo.extend(Roo.doc.Entry, Roo.bootstrap.Component, { * @class Roo.doc.Example * @extends Roo.bootstrap.Component * Example Element class + * @cfg {String} title short title describing example * @cfg {String} lang (phpcode|programlisting) section type. - * @cfg {String} code + * @cfg {String} code example code + * @cfg {String} output The expected output from the code * * * @constructor @@ -116,26 +118,51 @@ Roo.doc.Example = function(config){ Roo.extend(Roo.doc.Example, Roo.bootstrap.Component, { - + title : '', lang: 'php', code : '', + output : '', getAutoCreate : function(){ // no colour highlighting in here.... var cfg ={ - - cls : this.lang, - + cls : 'panel panel-info', cn : [ { - tag: 'code', - html : String.format('{0}',this.code).replace(/\n/g, '
') + cls : 'panel-heading', + html : this.title + }, + { + cls : 'panel-body', + cn : [ + { + tag: 'pre', + cls : this.lang, + html : String.format('{0}',this.code).replace(/\n/g, '
') + } + ] } ] }; + if (this.output) { + cfg.cn.push( + + { + cls : 'panel-footer', + cn : { + tag: 'code', + html : String.format('{0}',this.output).replace(/\n/g, '
') + } + } + + + ); + } + + return cfg; } @@ -430,6 +457,8 @@ Roo.doc.Section.map = { * @cfg {String} returntype return value * @cfg {String} name title really.. * @cfg {String} stype (function|constant) + * @cfg {String} memberof class name + * @cfg {bool} is_static is a static member * * @constructor * Create a new Synopsis @@ -442,13 +471,18 @@ Roo.doc.Synopsis = function(config){ Roo.extend(Roo.doc.Synopsis, Roo.bootstrap.Component, { - + memberof : '', + is_static : false, returntype : '', name: '', stype: 'function', getAutoCreate : function(){ + var syn = this.items[0]; // hopefully... + Roo.log(this.items); + + var cfg ={ tag: 'h5', cls : 'refsynopsisdiv', diff --git a/roojs-doc.js b/roojs-doc.js index edd619caff..36b55d6c41 100644 --- a/roojs-doc.js +++ b/roojs-doc.js @@ -3,8 +3,8 @@ Roo.doc=Roo.doc||{};Roo.doc.Entry=function(A){Roo.doc.Entry.superclass.construct ,{cls:'refnamediv',html:this.purpose}]};return A;},addxtype:function(A,B){return this.addxtypeChild(A,B);},onRender:function(ct,A){Roo.doc.Entry._calls++;if(Roo.doc.Entry._calls>1||!ct){return;}Roo.bootstrap.Component.prototype.onRender.call(this,ct,A);}} ); // Roo/doc/Example.js -Roo.doc.Example=function(A){Roo.doc.Example.superclass.constructor.call(this,A);};Roo.extend(Roo.doc.Example,Roo.bootstrap.Component,{lang:'php',code:'',getAutoCreate:function(){var A={cls:this.lang,cn:[{tag:'code',html:String.format('{0}',this.code).replace(/\n/g,'
')} -]};return A;}}); +Roo.doc.Example=function(A){Roo.doc.Example.superclass.constructor.call(this,A);};Roo.extend(Roo.doc.Example,Roo.bootstrap.Component,{title:'',lang:'php',code:'',output:'',getAutoCreate:function(){var A={cls:'panel panel-info',cn:[{cls:'panel-heading',html:this.title} +,{cls:'panel-body',cn:[{tag:'pre',cls:this.lang,html:String.format('{0}',this.code).replace(/\n/g,'
')}]}]};if(this.output){A.cn.push({cls:'panel-footer',cn:{tag:'code',html:String.format('{0}',this.output).replace(/\n/g,'
')}});}return A;}}); // Roo/doc/Para.js Roo.doc.Para=function(A){Roo.doc.Para.superclass.constructor.call(this,A);};Roo.extend(Roo.doc.Para,Roo.bootstrap.Component,{html:'',getAutoCreate:function(){var A={tag:'p',cls:'para',html:this.html};if(this.parent().is_list){return {tag:'li',cls:listitme,cn:[A]} ;}return A;}}); @@ -17,5 +17,6 @@ Roo.doc.Section=function(A){Roo.doc.Section.superclass.constructor.call(this,A); ;if(this.stype=='parameter'){var ul={tag:'ul',cls:'itemizedlist roo-params',cn:[]};var B=this.parent().items[0].items;for(var i=0;i