From 562d5a82daf86594c005c655f1aa908b1bcfd169 Mon Sep 17 00:00:00 2001 From: "Xiaoyang Yu (Max)" Date: Fri, 6 Jul 2012 10:07:15 +0800 Subject: [PATCH 1/9] [Widgets] Add more attributes to some widgets --- src/js/widgets.js | 132 +++++++++++++++++++++++++++++++++++++++------- 1 file changed, 113 insertions(+), 19 deletions(-) diff --git a/src/js/widgets.js b/src/js/widgets.js index 87f6ea6c..e88ca28a 100644 --- a/src/js/widgets.js +++ b/src/js/widgets.js @@ -62,7 +62,24 @@ var BCommonProperties = { options: [ "default", "a", "b", "c", "d", "e" ], defaultValue: "default", htmlAttribute: "data-theme" - } + }, + nativecontrol: { + displayName: "native control", + type: "boolean", + defaultValue: false, + htmlAttribute: { + name: "data-role", + value: { + true: "none", + false: "" + } + } + }, + inline: { + type: "boolean", + defaultValue: false, + htmlAttribute: "data-inline", + }, }; /** @@ -304,7 +321,18 @@ var BWidgetRegistry = { autoGenerate: "page", htmlAttribute: "id" }, - theme: BCommonProperties.theme + theme: BCommonProperties.theme, + dom_cache: { + displayName: "Cache in DOM", + type: "boolean", + defaultValue: false, + htmlAttribute: "data-dom-cache", + }, + title: { + type: "string", + defaultValue: "", + htmlAttribute: "data-title", + } }, redirect: { zone: "content", @@ -611,6 +639,12 @@ var BWidgetRegistry = { iconpos: $.extend({}, BCommonProperties.iconpos, { invalidIn: "Navbar" }), + iconshadow: { + type: "boolean", + defaultValue: "true", + htmlAttribute: "data-iconshadow", + displayName: "Icon Shadow" + }, mini: BCommonProperties.mini, active: { type: "boolean", @@ -624,12 +658,9 @@ var BWidgetRegistry = { } }, theme: BCommonProperties.theme, - inline: { - type: "boolean", - defaultValue: false, - htmlAttribute: "data-inline", + inline: $.extend({}, BCommonProperties.inline, { invalidIn: "Navbar" - }, + }), transition: { type: "string", options: [ "slide", "slideup", "slidedown", "pop", "fade", @@ -647,7 +678,17 @@ var BWidgetRegistry = { "false": "" } } - } + }, + corners: { + type: "boolean", + defaultValue: true, + htmlAttribute: "data-corners" + }, + shadow: { + type: "boolean", + defaultValue: true, + htmlAttribute: "data-shadow", + }, }, template: '%TEXT%' }, @@ -794,7 +835,13 @@ var BWidgetRegistry = { }), disabled: $.extend({}, BCommonProperties.disabled, { htmlSelector: "input" - }) + }), + highlight: { + type: "boolean", + defaultValue: "false", + htmlAttribute: "data-highlight", + htmlSelector: "input", + }, }, editable: { selector: "label", @@ -871,7 +918,10 @@ var BWidgetRegistry = { }, disabled: $.extend({}, BCommonProperties.disabled, { htmlSelector: "input" - }) + }), + nativecontrol: $.extend({}, BCommonProperties.nativecontrol, { + htmlSelector: "input" + }), }, template: '
' }, @@ -903,7 +953,8 @@ var BWidgetRegistry = { type: "string", defaultValue: "" }, - disabled: BCommonProperties.disabled + disabled: BCommonProperties.disabled, + nativecontrol: BCommonProperties.nativecontrol, }, template: '' }, @@ -934,12 +985,23 @@ var BWidgetRegistry = { }, mini: BCommonProperties.mini, theme: BCommonProperties.theme, - disabled: BCommonProperties.disabled + tracktheme: { + type: "string", + options: [ "default", "a", "b", "c", "d", "e" ], + defaultValue: "default", + htmlAttribute: "data-track-theme", + displayName: "Track Theme", + }, + disabled: BCommonProperties.disabled, + nativecontrol: BCommonProperties.nativecontrol, }, template: '', - // jQM generates a div next to the slider, which is the element actually - // clicked when users try to click the flip toggle switch. - delegate: "next" + delegate: function (domNode, admNode) { + if(admNode.getProperty("nativecontrol") === true) + return $(domNode); + else + return $(domNode).next(); + }, }, /** @@ -1013,7 +1075,12 @@ var BWidgetRegistry = { htmlAttribute: "multiple" }, mini: BCommonProperties.mini, - disabled: BCommonProperties.disabled + disabled: BCommonProperties.disabled, + inline: BCommonProperties.inline, + icon: BCommonProperties.icon, + iconpos: $.extend({}, BCommonProperties.iconpos, { + defaultValue: "right" + }), }, zones: [ { @@ -1139,7 +1206,8 @@ var BWidgetRegistry = { }, checked: BCommonProperties.checked, theme: BCommonProperties.theme, - disabled: BCommonProperties.disabled + disabled: BCommonProperties.disabled, + nativecontrol: BCommonProperties.nativecontrol, }, delegate: 'parent', template: function (node) { @@ -1271,6 +1339,19 @@ var BWidgetRegistry = { htmlAttribute: "data-filter" }, theme: BCommonProperties.theme, + filter_theme: { + displayName: "filter theme", + type: "string", + options: [ "default", "a", "b", "c", "d", "e" ], + defaultValue: "default", + htmlAttribute: "data-filter-theme" + }, + filter_placeholder: { + displayName: "filter placeholder", + type: "string", + defaultValue: "Filter items...", + htmlAttribute: "data-filter-placeholder" + }, divider: { displayName: "divider theme", type: "string", @@ -1314,6 +1395,12 @@ var BWidgetRegistry = { type: "string", defaultValue: "List Item" }, + filtertext: { + displayName: "filter text", + type: "string", + defaultValue: "List Item", + htmlAttribute: "data-filtertext", + }, theme: BCommonProperties.theme }, template: '
  • %TEXT%
    • ' @@ -1641,7 +1728,13 @@ var BWidgetRegistry = { content_theme: $.extend({}, BCommonProperties.theme, { displayName: "content theme", htmlAttribute: "data-content-theme" - }) + }), + collapsed: { + type: "boolean", + defaultValue: "true", + htmlAttribute: "data-collapsed", + }, + iconpos: BCommonProperties.iconpos, }, zones: [ { @@ -1677,7 +1770,8 @@ var BWidgetRegistry = { content_theme: $.extend({}, BCommonProperties.theme, { displayName: "content theme", htmlAttribute: "data-content-theme" - }) + }), + iconpos: BCommonProperties.iconpos, }, zones: [ { From dfff252b3e449871c7249dba3258495f91a3caba Mon Sep 17 00:00:00 2001 From: "Xiaoyang Yu (Max)" Date: Fri, 6 Jul 2012 14:34:00 +0800 Subject: [PATCH 2/9] [Widgets] Minor chages for properties --- src/js/widgets.js | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/js/widgets.js b/src/js/widgets.js index e88ca28a..e7456268 100644 --- a/src/js/widgets.js +++ b/src/js/widgets.js @@ -1339,13 +1339,10 @@ var BWidgetRegistry = { htmlAttribute: "data-filter" }, theme: BCommonProperties.theme, - filter_theme: { + filter_theme: $.extend({}, BCommonProperties.theme, { displayName: "filter theme", - type: "string", - options: [ "default", "a", "b", "c", "d", "e" ], - defaultValue: "default", htmlAttribute: "data-filter-theme" - }, + }), filter_placeholder: { displayName: "filter placeholder", type: "string", @@ -1731,7 +1728,7 @@ var BWidgetRegistry = { }), collapsed: { type: "boolean", - defaultValue: "true", + defaultValue: true, htmlAttribute: "data-collapsed", }, iconpos: BCommonProperties.iconpos, From 3f596ab660a5eba3570297b7933483848ac9c9f8 Mon Sep 17 00:00:00 2001 From: "Xiaoyang Yu (Max)" Date: Mon, 9 Jul 2012 12:19:16 +0800 Subject: [PATCH 3/9] [Widgets] Minor changes --- src/js/widgets.js | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/src/js/widgets.js b/src/js/widgets.js index e7456268..263e9ca5 100644 --- a/src/js/widgets.js +++ b/src/js/widgets.js @@ -641,7 +641,7 @@ var BWidgetRegistry = { }), iconshadow: { type: "boolean", - defaultValue: "true", + defaultValue: true, htmlAttribute: "data-iconshadow", displayName: "Icon Shadow" }, @@ -652,8 +652,8 @@ var BWidgetRegistry = { htmlAttribute: { name: "class", value: { - "true": "ui-btn-active", - "false": "" + true: "ui-btn-active", + false: "" } } }, @@ -674,8 +674,8 @@ var BWidgetRegistry = { htmlAttribute: { name: "data-rel", value: { - "true": "back", - "false": "" + true: "back", + false: "" } } }, @@ -838,7 +838,7 @@ var BWidgetRegistry = { }), highlight: { type: "boolean", - defaultValue: "false", + defaultValue: false, htmlAttribute: "data-highlight", htmlSelector: "input", }, @@ -985,13 +985,10 @@ var BWidgetRegistry = { }, mini: BCommonProperties.mini, theme: BCommonProperties.theme, - tracktheme: { - type: "string", - options: [ "default", "a", "b", "c", "d", "e" ], - defaultValue: "default", + track_theme: $.extend({}, BCommonProperties.theme, { + displayName: "track theme", htmlAttribute: "data-track-theme", - displayName: "Track Theme", - }, + }), disabled: BCommonProperties.disabled, nativecontrol: BCommonProperties.nativecontrol, }, From c17c268705f9e4287614d0f608e0234951bb59ac Mon Sep 17 00:00:00 2001 From: "Xiaoyang Yu (Max)" Date: Tue, 10 Jul 2012 14:49:40 +0800 Subject: [PATCH 4/9] [Widgets] true and false cannot be used as keys in an Object --- src/js/widgets.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/js/widgets.js b/src/js/widgets.js index 263e9ca5..8039b10c 100644 --- a/src/js/widgets.js +++ b/src/js/widgets.js @@ -652,8 +652,8 @@ var BWidgetRegistry = { htmlAttribute: { name: "class", value: { - true: "ui-btn-active", - false: "" + "true": "ui-btn-active", + "false": "" } } }, @@ -674,8 +674,8 @@ var BWidgetRegistry = { htmlAttribute: { name: "data-rel", value: { - true: "back", - false: "" + "true": "back", + "false": "" } } }, From 74c5e83eacaf336ddfffa9555bc855735504a8ff Mon Sep 17 00:00:00 2001 From: "Xiaoyang Yu (Max)" Date: Wed, 11 Jul 2012 10:47:07 +0800 Subject: [PATCH 5/9] [Widgets] Put common properties in alphabetical order --- src/js/widgets.js | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/js/widgets.js b/src/js/widgets.js index 8039b10c..8e299320 100644 --- a/src/js/widgets.js +++ b/src/js/widgets.js @@ -40,6 +40,11 @@ var BCommonProperties = { defaultValue: "left", htmlAttribute: "data-iconpos" }, + inline: { + type: "boolean", + defaultValue: false, + htmlAttribute: "data-inline", + }, mini: { type: "boolean", defaultValue: false, @@ -51,18 +56,6 @@ var BCommonProperties = { } } }, - position: { - type: "string", - options: [ "default", "fixed" ], - defaultValue: "default", - htmlAttribute: "data-position" - }, - theme: { - type: "string", - options: [ "default", "a", "b", "c", "d", "e" ], - defaultValue: "default", - htmlAttribute: "data-theme" - }, nativecontrol: { displayName: "native control", type: "boolean", @@ -75,10 +68,17 @@ var BCommonProperties = { } } }, - inline: { - type: "boolean", - defaultValue: false, - htmlAttribute: "data-inline", + position: { + type: "string", + options: [ "default", "fixed" ], + defaultValue: "default", + htmlAttribute: "data-position" + }, + theme: { + type: "string", + options: [ "default", "a", "b", "c", "d", "e" ], + defaultValue: "default", + htmlAttribute: "data-theme" }, }; From 0d3bc122cac2e15d5efcbd682bfa412b89f7b5f6 Mon Sep 17 00:00:00 2001 From: "Xiaoyang Yu (Max)" Date: Wed, 11 Jul 2012 10:50:40 +0800 Subject: [PATCH 6/9] [Widgets] Remove Cache in Dom property --- src/js/widgets.js | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/js/widgets.js b/src/js/widgets.js index 8e299320..201429d5 100644 --- a/src/js/widgets.js +++ b/src/js/widgets.js @@ -322,12 +322,6 @@ var BWidgetRegistry = { htmlAttribute: "id" }, theme: BCommonProperties.theme, - dom_cache: { - displayName: "Cache in DOM", - type: "boolean", - defaultValue: false, - htmlAttribute: "data-dom-cache", - }, title: { type: "string", defaultValue: "", From 156ba1893a9ddd68bfdbc179c424c873fd14467a Mon Sep 17 00:00:00 2001 From: "Xiaoyang Yu (Max)" Date: Wed, 11 Jul 2012 10:53:23 +0800 Subject: [PATCH 7/9] [Widgets] displayName comes first. --- src/js/widgets.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/widgets.js b/src/js/widgets.js index 201429d5..626031f9 100644 --- a/src/js/widgets.js +++ b/src/js/widgets.js @@ -634,10 +634,10 @@ var BWidgetRegistry = { invalidIn: "Navbar" }), iconshadow: { + displayName: "icon shadow" type: "boolean", defaultValue: true, htmlAttribute: "data-iconshadow", - displayName: "Icon Shadow" }, mini: BCommonProperties.mini, active: { From 68ccffc15235653168a29f4d32142be95e70e160 Mon Sep 17 00:00:00 2001 From: "Xiaoyang Yu (Max)" Date: Wed, 11 Jul 2012 10:56:36 +0800 Subject: [PATCH 8/9] [Widgets] Add a new common property "track_theme" --- src/js/widgets.js | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/js/widgets.js b/src/js/widgets.js index 626031f9..b20f5507 100644 --- a/src/js/widgets.js +++ b/src/js/widgets.js @@ -80,6 +80,13 @@ var BCommonProperties = { defaultValue: "default", htmlAttribute: "data-theme" }, + track_theme: { + displayName: "track theme", + type: "string", + options: [ "default", "a", "b", "c", "d", "e" ], + defaultValue: "default", + htmlAttribute: "data-track-theme", + }), }; /** @@ -822,9 +829,7 @@ var BWidgetRegistry = { theme: $.extend({}, BCommonProperties.theme, { htmlSelector: "input" }), - track_theme: $.extend({}, BCommonProperties.theme, { - displayName: "track theme", - htmlAttribute: "data-track-theme", + track_theme: $.extend({}, BCommonProperties.track_theme, { htmlSelector: "input" }), disabled: $.extend({}, BCommonProperties.disabled, { @@ -979,10 +984,7 @@ var BWidgetRegistry = { }, mini: BCommonProperties.mini, theme: BCommonProperties.theme, - track_theme: $.extend({}, BCommonProperties.theme, { - displayName: "track theme", - htmlAttribute: "data-track-theme", - }), + track_theme: BCommonProperties.track_theme, disabled: BCommonProperties.disabled, nativecontrol: BCommonProperties.nativecontrol, }, From 98f5a334377079d41ee1b108754f3c1063e16add Mon Sep 17 00:00:00 2001 From: "Xiaoyang Yu (Max)" Date: Wed, 11 Jul 2012 10:59:51 +0800 Subject: [PATCH 9/9] [Widgets] Fix typo --- src/js/widgets.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/js/widgets.js b/src/js/widgets.js index b20f5507..d1a7d129 100644 --- a/src/js/widgets.js +++ b/src/js/widgets.js @@ -86,7 +86,7 @@ var BCommonProperties = { options: [ "default", "a", "b", "c", "d", "e" ], defaultValue: "default", htmlAttribute: "data-track-theme", - }), + }, }; /** @@ -641,7 +641,7 @@ var BWidgetRegistry = { invalidIn: "Navbar" }), iconshadow: { - displayName: "icon shadow" + displayName: "icon shadow", type: "boolean", defaultValue: true, htmlAttribute: "data-iconshadow",