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/alert.reel/alert.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/alert.reel/alert.html')
-rwxr-xr-x | node_modules/montage/ui/popup/alert.reel/alert.html | 32 |
1 files changed, 7 insertions, 25 deletions
diff --git a/node_modules/montage/ui/popup/alert.reel/alert.html b/node_modules/montage/ui/popup/alert.reel/alert.html index cb4ef751..40b0d2d5 100755 --- a/node_modules/montage/ui/popup/alert.reel/alert.html +++ b/node_modules/montage/ui/popup/alert.reel/alert.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="alert.css"> | 10 | <link rel="stylesheet" type="text/css" href="alert.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.title"} |
23 | "boundObject": { | ||
24 | "@": "owner" | ||
25 | }, | ||
26 | "boundObjectPropertyPath": "title", | ||
27 | "oneway": true | ||
28 | } | ||
29 | } | 23 | } |
30 | }, | 24 | }, |
31 | "dynamictext2": { | 25 | "dynamictext2": { |
@@ -37,13 +31,7 @@ | |||
37 | } | 31 | } |
38 | }, | 32 | }, |
39 | "bindings": { | 33 | "bindings": { |
40 | "value": { | 34 | "value": {"<-": "@owner.msg"} |
41 | "boundObject": { | ||
42 | "@": "owner" | ||
43 | }, | ||
44 | "boundObjectPropertyPath": "msg", | ||
45 | "oneway": true | ||
46 | } | ||
47 | } | 35 | } |
48 | }, | 36 | }, |
49 | "dynamictext3": { | 37 | "dynamictext3": { |
@@ -55,13 +43,7 @@ | |||
55 | } | 43 | } |
56 | }, | 44 | }, |
57 | "bindings": { | 45 | "bindings": { |
58 | "value": { | 46 | "value": {"<-": "@owner.details"} |
59 | "boundObject": { | ||
60 | "@": "owner" | ||
61 | }, | ||
62 | "boundObjectPropertyPath": "details", | ||
63 | "oneway": true | ||
64 | } | ||
65 | } | 47 | } |
66 | }, | 48 | }, |
67 | "button1": { | 49 | "button1": { |
@@ -91,8 +73,8 @@ | |||
91 | } | 73 | } |
92 | } | 74 | } |
93 | } | 75 | } |
94 | } | 76 | |
95 | </script> | 77 | }</script> |
96 | 78 | ||
97 | 79 | ||
98 | </head> | 80 | </head> |