From 54d0a44b1f3186172119ff959f67d6bcef2d767f Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Mon, 11 May 2015 20:02:33 +0800 Subject: [PATCH] Roo/bootstrap/Button.js Roo/Component.js buildSDK/doc_templates/class.html --- Roo/Component.js | 2 +- Roo/bootstrap/Button.js | 26 +++++++++++++------------- buildSDK/doc_templates/class.html | 5 ++++- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/Roo/Component.js b/Roo/Component.js index fe851ed64f..e5b0ce13e7 100644 --- a/Roo/Component.js +++ b/Roo/Component.js @@ -133,7 +133,7 @@ Roo.extend(Roo.Component, Roo.util.Observable, { * Whether the component can move the Dom node when rendering (defaults to true). */ allowDomMove : true, - /** @cfg {String} hideMode + /** @cfg {String} hideMode (display|visibility) * How this component should hidden. Supported values are * "visibility" (css visibility), "offsets" (negative offset position) and * "display" (css display) - defaults to "display". diff --git a/Roo/bootstrap/Button.js b/Roo/bootstrap/Button.js index 29beaf86a1..e797a70826 100644 --- a/Roo/bootstrap/Button.js +++ b/Roo/bootstrap/Button.js @@ -10,23 +10,23 @@ * @extends Roo.bootstrap.Component * Bootstrap Button class * @cfg {String} html The button content - * @cfg {String} weight default (or empty) | primary | success | info | warning | danger | link - * @cfg {String} size empty | lg | sm | xs - * @cfg {String} tag empty | a | input | submit + * @cfg {String} weight ( primary | success | info | warning | danger | link ) default + * @cfg {String} size ( lg | sm | xs) + * @cfg {String} tag ( a | input | submit) * @cfg {String} href empty or href - * @cfg {Boolean} disabled false | true - * @cfg {Boolean} isClose false | true - * @cfg {String} glyphicon empty | adjust | align-center | align-justify | align-left | align-right | arrow-down | arrow-left | arrow-right | arrow-up | asterisk | backward | ban-circle | barcode | bell | bold | book | bookmark | briefcase | bullhorn | calendar | camera | certificate | check | chevron-down | chevron-left | chevron-right | chevron-up | circle-arrow-down | circle-arrow-left | circle-arrow-right | circle-arrow-up | cloud | cloud-download | cloud-upload | cog | collapse-down | collapse-up | comment | compressed | copyright-mark | credit-card | cutlery | dashboard | download | download-alt | earphone | edit | eject | envelope | euro | exclamation-sign | expand | export | eye-close | eye-open | facetime-video | fast-backward | fast-forward | file | film | filter | fire | flag | flash | floppy-disk | floppy-open | floppy-remove | floppy-save | floppy-saved | folder-close | folder-open | font | forward | fullscreen | gbp | gift | glass | globe | hand-down | hand-left | hand-right | hand-up | hd-video | hdd | header | headphones | heart | heart-empty | home | import | inbox | indent-left | indent-right | info-sign | italic | leaf | link | list | list-alt | lock | log-in | log-out | magnet | map-marker | minus | minus-sign | move | music | new-window | off | ok | ok-circle | ok-sign | open | paperclip | pause | pencil | phone | phone-alt | picture | plane | play | play-circle | plus | plus-sign | print | pushpin | qrcode | question-sign | random | record | refresh | registration-mark | remove | remove-circle | remove-sign | repeat | resize-full | resize-horizontal | resize-small | resize-vertical | retweet | road | save | saved | screenshot | sd-video | search | send | share | share-alt | shopping-cart | signal | sort | sort-by-alphabet | sort-by-alphabet-alt | sort-by-attributes | sort-by-attributes-alt | sort-by-order | sort-by-order-alt | sound-5-1 | sound-6-1 | sound-7-1 | sound-dolby | sound-stereo | star | star-empty | stats | step-backward | step-forward | stop | subtitles | tag | tags | tasks | text-height | text-width | th | th-large | th-list | thumbs-down | thumbs-up | time | tint | tower | transfer | trash | tree-conifer | tree-deciduous | unchecked | upload | usd | user | volume-down | volume-off | volume-up | warning-sign | wrench | zoom-in | zoom-out + * @cfg {Boolean} disabled default false; + * @cfg {Boolean} isClose default false; + * @cfg {String} glyphicon (| adjust | align-center | align-justify | align-left | align-right | arrow-down | arrow-left | arrow-right | arrow-up | asterisk | backward | ban-circle | barcode | bell | bold | book | bookmark | briefcase | bullhorn | calendar | camera | certificate | check | chevron-down | chevron-left | chevron-right | chevron-up | circle-arrow-down | circle-arrow-left | circle-arrow-right | circle-arrow-up | cloud | cloud-download | cloud-upload | cog | collapse-down | collapse-up | comment | compressed | copyright-mark | credit-card | cutlery | dashboard | download | download-alt | earphone | edit | eject | envelope | euro | exclamation-sign | expand | export | eye-close | eye-open | facetime-video | fast-backward | fast-forward | file | film | filter | fire | flag | flash | floppy-disk | floppy-open | floppy-remove | floppy-save | floppy-saved | folder-close | folder-open | font | forward | fullscreen | gbp | gift | glass | globe | hand-down | hand-left | hand-right | hand-up | hd-video | hdd | header | headphones | heart | heart-empty | home | import | inbox | indent-left | indent-right | info-sign | italic | leaf | link | list | list-alt | lock | log-in | log-out | magnet | map-marker | minus | minus-sign | move | music | new-window | off | ok | ok-circle | ok-sign | open | paperclip | pause | pencil | phone | phone-alt | picture | plane | play | play-circle | plus | plus-sign | print | pushpin | qrcode | question-sign | random | record | refresh | registration-mark | remove | remove-circle | remove-sign | repeat | resize-full | resize-horizontal | resize-small | resize-vertical | retweet | road | save | saved | screenshot | sd-video | search | send | share | share-alt | shopping-cart | signal | sort | sort-by-alphabet | sort-by-alphabet-alt | sort-by-attributes | sort-by-attributes-alt | sort-by-order | sort-by-order-alt | sound-5-1 | sound-6-1 | sound-7-1 | sound-dolby | sound-stereo | star | star-empty | stats | step-backward | step-forward | stop | subtitles | tag | tags | tasks | text-height | text-width | th | th-large | th-list | thumbs-down | thumbs-up | time | tint | tower | transfer | trash | tree-conifer | tree-deciduous | unchecked | upload | usd | user | volume-down | volume-off | volume-up | warning-sign | wrench | zoom-in | zoom-out) * @cfg {String} badge text for badge - * @cfg {String} theme default (or empty) | glow - * @cfg {Boolean} inverse false | true - * @cfg {Boolean} toggle false | true + * @cfg {String} theme default + * @cfg {Boolean} inverse + * @cfg {Boolean} toggle * @cfg {String} ontext text for on toggle state * @cfg {String} offtext text for off toggle state - * @cfg {Boolean} defaulton true | false - * @cfg {Boolean} preventDefault (true | false) default true - * @cfg {Boolean} removeClass true | false remove the standard class.. - * @cfg {String} target (_self|_blank|_parent|_top)target for a href. + * @cfg {Boolean} defaulton + * @cfg {Boolean} preventDefault default true + * @cfg {Boolean} removeClass remove the standard class.. + * @cfg {String} target target for a href. (_self|_blank|_parent|_top| other) * * @constructor * Create a new button diff --git a/buildSDK/doc_templates/class.html b/buildSDK/doc_templates/class.html index 67eb44329c..ce6fd19a1a 100644 --- a/buildSDK/doc_templates/class.html +++ b/buildSDK/doc_templates/class.html @@ -211,7 +211,10 @@
-
{+resolveLinks(dtag.desc)+}
+
+ {+resolveLinks(dtag.desc)+} + {+dtag.optvalues ? ("
Possible Values: " + dtag.optvalues.map(function(v) { return v.length ? v : "Empty"; }).join(", ")) : '' +} +
-- 2.39.2