diff options
author | Pushkar Joshi | 2012-04-19 14:12:45 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-04-19 14:12:45 -0700 |
commit | 9f32d7e5454db3189209fc68a286a7fdb0c31fe8 (patch) | |
tree | a51c2bf67839a25158c30752b44fdea0eac28b9d /node_modules/montage/ui/popup/confirm.reel/confirm.html | |
parent | dc1e8dde18c40cf740bd2fe09165784e0d415fab (diff) | |
parent | 6d33345a9e609e36539d2efa25569f5eeb04a2af (diff) | |
download | ninja-9f32d7e5454db3189209fc68a286a7fdb0c31fe8.tar.gz |
Merge branch 'master' into pentool
Conflicts:
js/helper-classes/3D/view-utils.js
Diffstat (limited to 'node_modules/montage/ui/popup/confirm.reel/confirm.html')
-rwxr-xr-x | node_modules/montage/ui/popup/confirm.reel/confirm.html | 32 |
1 files changed, 7 insertions, 25 deletions
diff --git a/node_modules/montage/ui/popup/confirm.reel/confirm.html b/node_modules/montage/ui/popup/confirm.reel/confirm.html index 63b521bd..5762f1ad 100755 --- a/node_modules/montage/ui/popup/confirm.reel/confirm.html +++ b/node_modules/montage/ui/popup/confirm.reel/confirm.html | |||
@@ -8,8 +8,8 @@ | |||
8 | <head> | 8 | <head> |
9 | <meta http-equiv="content-type" content="text/html; charset=utf-8"/> | 9 | <meta http-equiv="content-type" content="text/html; charset=utf-8"/> |
10 | <link rel="stylesheet" type="text/css" href="confirm.css"> | 10 | <link rel="stylesheet" type="text/css" href="confirm.css"> |
11 | <script type="text/montage-serialization"> | 11 | <script type="text/montage-serialization">{ |
12 | { | 12 | |
13 | "dynamictext1": { | 13 | "dynamictext1": { |
14 | "module": "montage/ui/dynamic-text.reel", | 14 | "module": "montage/ui/dynamic-text.reel", |
15 | "name": "DynamicText", | 15 | "name": "DynamicText", |
@@ -19,13 +19,7 @@ | |||
19 | } | 19 | } |
20 | }, | 20 | }, |
21 | "bindings": { | 21 | "bindings": { |
22 | "value": { | 22 | "value": {"<-": "@owner.msg"} |
23 | "boundObject": { | ||
24 | "@": "owner" | ||
25 | }, | ||
26 | "boundObjectPropertyPath": "msg", | ||
27 | "oneway": true | ||
28 | } | ||
29 | } | 23 | } |
30 | }, | 24 | }, |
31 | "button1": { | 25 | "button1": { |
@@ -38,13 +32,7 @@ | |||
38 | } | 32 | } |
39 | }, | 33 | }, |
40 | "bindings": { | 34 | "bindings": { |
41 | "value": { | 35 | "value": {"<-": "@owner.okLabel"} |
42 | "boundObject": { | ||
43 | "@": "owner" | ||
44 | }, | ||
45 | "boundObjectPropertyPath": "okLabel", | ||
46 | "oneway": true | ||
47 | } | ||
48 | }, | 36 | }, |
49 | "listeners": [ | 37 | "listeners": [ |
50 | { | 38 | { |
@@ -65,13 +53,7 @@ | |||
65 | } | 53 | } |
66 | }, | 54 | }, |
67 | "bindings": { | 55 | "bindings": { |
68 | "value": { | 56 | "value": {"<-": "@owner.cancelLabel"} |
69 | "boundObject": { | ||
70 | "@": "owner" | ||
71 | }, | ||
72 | "boundObjectPropertyPath": "cancelLabel", | ||
73 | "oneway": true | ||
74 | } | ||
75 | }, | 57 | }, |
76 | "listeners": [ | 58 | "listeners": [ |
77 | { | 59 | { |
@@ -91,8 +73,8 @@ | |||
91 | } | 73 | } |
92 | } | 74 | } |
93 | } | 75 | } |
94 | } | 76 | |
95 | </script> | 77 | }</script> |
96 | 78 | ||
97 | 79 | ||
98 | </head> | 80 | </head> |