aboutsummaryrefslogtreecommitdiff
path: root/js/components/ui
diff options
context:
space:
mode:
authorEric Guzman2012-06-19 01:20:36 -0700
committerEric Guzman2012-06-19 01:20:36 -0700
commit2ef72cdf0e59fb3623a2c13251ac707522f3dc5a (patch)
treef69f4e3de7e4441311ef2b38770e0ce26067aac4 /js/components/ui
parent5260d3dfd99d79924c4aaa3ab798e90c7d328d7d (diff)
parent1007cbf983ad0f2460a4122a492a96023fdb4439 (diff)
downloadninja-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 'js/components/ui')
-rwxr-xr-xjs/components/ui/color-chip.reel/color-chip.js5
-rwxr-xr-xjs/components/ui/file-input.reel/file-input.js10
-rwxr-xr-xjs/components/ui/icon-list-basic/icon.reel/icon.js12
-rwxr-xr-xjs/components/ui/icon-list-basic/iconsList.reel/iconsList.html22
-rwxr-xr-xjs/components/ui/icon-list-basic/iconsList.reel/iconsList.js4
5 files changed, 34 insertions, 19 deletions
diff --git a/js/components/ui/color-chip.reel/color-chip.js b/js/components/ui/color-chip.reel/color-chip.js
index 630dcd4b..a684d0db 100755
--- a/js/components/ui/color-chip.reel/color-chip.js
+++ b/js/components/ui/color-chip.reel/color-chip.js
@@ -9,6 +9,11 @@ var Montage = require("montage/core/core").Montage,
9 9
10var ColorChip = exports.ColorChip = Montage.create(Component, { 10var ColorChip = exports.ColorChip = Montage.create(Component, {
11 11
12 icon: {
13 value: null,
14 serializable: true
15 },
16
12 chip: { 17 chip: {
13 value: false 18 value: false
14 }, 19 },
diff --git a/js/components/ui/file-input.reel/file-input.js b/js/components/ui/file-input.reel/file-input.js
index 584380ec..adec6d84 100755
--- a/js/components/ui/file-input.reel/file-input.js
+++ b/js/components/ui/file-input.reel/file-input.js
@@ -9,6 +9,16 @@ var Montage = require("montage/core/core").Montage,
9 9
10var FileInput = exports.FileInput = Montage.create(Component, { 10var FileInput = exports.FileInput = Montage.create(Component, {
11 11
12 inputField: {
13 value: null,
14 serializable: true
15 },
16
17 filePathField: {
18 value: null,
19 serializable: true
20 },
21
12 _filePath: { 22 _filePath: {
13 enumerable: false, 23 enumerable: false,
14 value: "" 24 value: ""
diff --git a/js/components/ui/icon-list-basic/icon.reel/icon.js b/js/components/ui/icon-list-basic/icon.reel/icon.js
index 7d36bc59..cfda4a1a 100755
--- a/js/components/ui/icon-list-basic/icon.reel/icon.js
+++ b/js/components/ui/icon-list-basic/icon.reel/icon.js
@@ -7,7 +7,17 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
7var Montage = require("montage/core/core").Montage; 7var Montage = require("montage/core/core").Montage;
8var Component = require("montage/ui/component").Component; 8var Component = require("montage/ui/component").Component;
9 9
10var Icon = exports.Icon = Montage.create(Component, { 10exports.Icon = Montage.create(Component, {
11
12 iconImg: {
13 value: null,
14 serializable: true
15 },
16
17 iconLabel: {
18 value: null,
19 serializable: true
20 },
11 21
12 _icondata:{ 22 _icondata:{
13 enumerable : false, 23 enumerable : false,
diff --git a/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html b/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html
index 05d3ea7d..9d4e0103 100755
--- a/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html
+++ b/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html
@@ -16,16 +16,8 @@
16 "element": {"#": "icon"} 16 "element": {"#": "icon"}
17 }, 17 },
18 "bindings": { 18 "bindings": {
19 "icondata": { 19 "icondata": {"<-": "@repetition1.objectAtCurrentIteration"},
20 "boundObject": {"@": "repetition1"}, 20 "selectedUri": {"<-": "@owner.selected"}
21 "boundObjectPropertyPath": "objectAtCurrentIteration",
22 "oneway": true
23 },
24 "selectedUri": {
25 "boundObject": {"@": "owner"},
26 "boundObjectPropertyPath": "selected",
27 "oneway": true
28 }
29 } 21 }
30 }, 22 },
31 23
@@ -35,20 +27,14 @@
35 "element": {"#": "iconsView"} 27 "element": {"#": "iconsView"}
36 }, 28 },
37 "bindings": { 29 "bindings": {
38 "objects": { 30 "objects": {"<-": "@owner.iconsViewDataObject"}
39 "boundObject": {"@": "owner"},
40 "boundObjectPropertyPath": "iconsViewDataObject",
41 "oneway": true
42 }
43 } 31 }
44
45 }, 32 },
46 33
47 "owner" : { 34 "owner" : {
48 "prototype" : "js/components/ui/icon-list-basic/iconsList.reel", 35 "prototype" : "js/components/ui/icon-list-basic/iconsList.reel",
49 "properties" : { 36 "properties" : {
50 "element" : {"#": "list"}, 37 "element" : {"#": "list"}
51 "components": [{"@": "repetition1"}]
52 } 38 }
53 } 39 }
54 } 40 }
diff --git a/js/components/ui/icon-list-basic/iconsList.reel/iconsList.js b/js/components/ui/icon-list-basic/iconsList.reel/iconsList.js
index d36aa40f..230c7f64 100755
--- a/js/components/ui/icon-list-basic/iconsList.reel/iconsList.js
+++ b/js/components/ui/icon-list-basic/iconsList.reel/iconsList.js
@@ -9,6 +9,10 @@ var Component = require("montage/ui/component").Component;
9 9
10var IconsList = exports.IconsList = Montage.create(Component, { 10var IconsList = exports.IconsList = Montage.create(Component, {
11 11
12 components: {
13 value: null
14 },
15
12 anItemData:{ 16 anItemData:{
13 enumerable:true, 17 enumerable:true,
14 value: null 18 value: null