diff options
author | Eric Guzman | 2012-06-19 01:20:36 -0700 |
---|---|---|
committer | Eric Guzman | 2012-06-19 01:20:36 -0700 |
commit | 2ef72cdf0e59fb3623a2c13251ac707522f3dc5a (patch) | |
tree | f69f4e3de7e4441311ef2b38770e0ce26067aac4 /node_modules/montage/ui | |
parent | 5260d3dfd99d79924c4aaa3ab798e90c7d328d7d (diff) | |
parent | 1007cbf983ad0f2460a4122a492a96023fdb4439 (diff) | |
download | ninja-2ef72cdf0e59fb3623a2c13251ac707522f3dc5a.tar.gz |
Merge branch 'binding' of github.com:dhg637/ninja-internal into binding
Conflicts:
js/stage/binding-view.reel/binding-view.js
Diffstat (limited to 'node_modules/montage/ui')
59 files changed, 933 insertions, 1106 deletions
diff --git a/node_modules/montage/ui/autocomplete/autocomplete.reel/autocomplete.js b/node_modules/montage/ui/autocomplete/autocomplete.reel/autocomplete.js index c9cbca74..4e2dd82e 100644 --- a/node_modules/montage/ui/autocomplete/autocomplete.reel/autocomplete.js +++ b/node_modules/montage/ui/autocomplete/autocomplete.reel/autocomplete.js | |||
@@ -70,7 +70,6 @@ var Autocomplete = exports.Autocomplete = Montage.create(TextInput, { | |||
70 | 70 | ||
71 | _delay: {value: null}, | 71 | _delay: {value: null}, |
72 | delay: { | 72 | delay: { |
73 | distinct: true, | ||
74 | get: function(){ | 73 | get: function(){ |
75 | return this._delay; | 74 | return this._delay; |
76 | }, | 75 | }, |
@@ -81,7 +80,8 @@ var Autocomplete = exports.Autocomplete = Montage.create(TextInput, { | |||
81 | } | 80 | } |
82 | this._delay = value; | 81 | this._delay = value; |
83 | } | 82 | } |
84 | } | 83 | }, |
84 | serializable: true | ||
85 | }, | 85 | }, |
86 | 86 | ||
87 | /** | 87 | /** |
@@ -89,7 +89,8 @@ var Autocomplete = exports.Autocomplete = Montage.create(TextInput, { | |||
89 | * Default = 2 | 89 | * Default = 2 |
90 | */ | 90 | */ |
91 | minLength: { | 91 | minLength: { |
92 | value: null | 92 | value: null, |
93 | serializable: true | ||
93 | }, | 94 | }, |
94 | 95 | ||
95 | _tokens: {value: null}, | 96 | _tokens: {value: null}, |
@@ -104,8 +105,7 @@ var Autocomplete = exports.Autocomplete = Montage.create(TextInput, { | |||
104 | }, | 105 | }, |
105 | modify: function(v) { | 106 | modify: function(v) { |
106 | this._tokens = v; | 107 | this._tokens = v; |
107 | }, | 108 | } |
108 | distinct: true | ||
109 | }, | 109 | }, |
110 | 110 | ||
111 | // overridden here to get the substring/searchString | 111 | // overridden here to get the substring/searchString |
@@ -241,7 +241,6 @@ var Autocomplete = exports.Autocomplete = Montage.create(TextInput, { | |||
241 | 241 | ||
242 | _suggestedValue: {value: null}, | 242 | _suggestedValue: {value: null}, |
243 | suggestedValue: { | 243 | suggestedValue: { |
244 | distinct: true, | ||
245 | enumerable: false, | 244 | enumerable: false, |
246 | get: function() { | 245 | get: function() { |
247 | return this._suggestedValue; | 246 | return this._suggestedValue; |
@@ -443,7 +442,9 @@ var Autocomplete = exports.Autocomplete = Montage.create(TextInput, { | |||
443 | fn.call(this); | 442 | fn.call(this); |
444 | 443 | ||
445 | if (!this._valueSyncedWithInputField) { | 444 | if (!this._valueSyncedWithInputField) { |
446 | this.value = this.tokens.join(this.separator); | 445 | if(this.tokens) { |
446 | this.value = this.tokens.join(this.separator); | ||
447 | } | ||
447 | if(this.value && this.value.charAt(this.value.length-1) != this.separator) { | 448 | if(this.value && this.value.charAt(this.value.length-1) != this.separator) { |
448 | this.value += this.separator; | 449 | this.value += this.separator; |
449 | } | 450 | } |
diff --git a/node_modules/montage/ui/autocomplete/results-list.reel/results-list.html b/node_modules/montage/ui/autocomplete/results-list.reel/results-list.html index 2f904d62..c40d36ce 100644 --- a/node_modules/montage/ui/autocomplete/results-list.reel/results-list.html +++ b/node_modules/montage/ui/autocomplete/results-list.reel/results-list.html | |||
@@ -9,21 +9,20 @@ | |||
9 | { | 9 | { |
10 | 10 | ||
11 | "results": { | 11 | "results": { |
12 | "prototype": "montage/ui/controller/array-controller", | 12 | "prototype": "ui/controller/array-controller", |
13 | "properties": { | 13 | "properties": { |
14 | "selectObjectsOnAddition": true, | 14 | "selectObjectsOnAddition": true, |
15 | "automaticallyOrganizeObjects": true | 15 | "automaticallyOrganizeObjects": true |
16 | } | 16 | } |
17 | }, | 17 | }, |
18 | "repetition1": { | 18 | "repetition1": { |
19 | "prototype": "montage/ui/repetition.reel", | 19 | "prototype": "ui/repetition.reel", |
20 | "properties": { | 20 | "properties": { |
21 | "element": { | 21 | "element": { |
22 | "#": "repetition1" | 22 | "#": "repetition1" |
23 | }, | 23 | }, |
24 | "contentController": {"@": "results"}, | 24 | "contentController": {"@": "results"}, |
25 | "isSelectionEnabled": true, | 25 | "isSelectionEnabled": true |
26 | "orientation": "vertical" | ||
27 | }, | 26 | }, |
28 | "bindings": { | 27 | "bindings": { |
29 | "contentCont |