diff options
author | Valerio Virgillito | 2012-05-03 22:53:07 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-05-03 22:53:07 -0700 |
commit | 24b483db367291b72170f969de78efcb1a9b95bd (patch) | |
tree | a691a7803cefbfa76a6331a50cbeebcd16287d91 /node_modules/montage/ui/popup | |
parent | dc93269cfa7c315d22d85c8217e2412749643f28 (diff) | |
download | ninja-24b483db367291b72170f969de78efcb1a9b95bd.tar.gz |
integrating the latest montage version
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'node_modules/montage/ui/popup')
6 files changed, 55 insertions, 49 deletions
diff --git a/node_modules/montage/ui/popup/alert.reel/alert.html b/node_modules/montage/ui/popup/alert.reel/alert.html index 40b0d2d5..5046d78f 100755 --- a/node_modules/montage/ui/popup/alert.reel/alert.html +++ b/node_modules/montage/ui/popup/alert.reel/alert.html | |||
@@ -11,8 +11,7 @@ | |||
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 | "prototype": "montage/ui/dynamic-text.reel", |
15 | "name": "DynamicText", | ||
16 | "properties": { | 15 | "properties": { |
17 | "element": { | 16 | "element": { |
18 | "#": "title" | 17 | "#": "title" |
@@ -23,8 +22,7 @@ | |||
23 | } | 22 | } |
24 | }, | 23 | }, |
25 | "dynamictext2": { | 24 | "dynamictext2": { |
26 | "module": "montage/ui/dynamic-text.reel", | 25 | "prototype": "montage/ui/dynamic-text.reel", |
27 | "name": "DynamicText", | ||
28 | "properties": { | 26 | "properties": { |
29 | "element": { | 27 | "element": { |
30 | "#": "msg" | 28 | "#": "msg" |
@@ -35,8 +33,7 @@ | |||
35 | } | 33 | } |
36 | }, | 34 | }, |
37 | "dynamictext3": { | 35 | "dynamictext3": { |
38 | "module": "montage/ui/dynamic-text.reel", | 36 | "prototype": "montage/ui/dynamic-text.reel", |
39 | "name": "DynamicText", | ||
40 | "properties": { | 37 | "properties": { |
41 | "element": { | 38 | "element": { |
42 | "#": "msg-detail" | 39 | "#": "msg-detail" |
@@ -47,8 +44,7 @@ | |||
47 | } | 44 | } |
48 | }, | 45 | }, |
49 | "button1": { | 46 | "button1": { |
50 | "module": "montage/ui/bluemoon/button.reel", | 47 | "prototype": "montage/ui/bluemoon/button.reel", |
51 | "name": "Button", | ||
52 | "properties": { | 48 | "properties": { |
53 | "identifier": "Ok", | 49 | "identifier": "Ok", |
54 | "element": { | 50 | "element": { |
@@ -65,8 +61,7 @@ | |||
65 | ] | 61 | ] |
66 | }, | 62 | }, |
67 | "owner": { | 63 | "owner": { |
68 | "module": "montage/ui/popup/alert.reel", | 64 | "prototype": "montage/ui/popup/alert.reel", |
69 | "name": "Alert", | ||
70 | "properties": { | 65 | "properties": { |
71 | "element": { | 66 | "element": { |
72 | "#": "alert-container" | 67 | "#": "alert-container" |
@@ -79,20 +74,20 @@ | |||
79 | 74 | ||
80 | </head> | 75 | </head> |
81 | <body> | 76 | <body> |
82 | <div id="alert-container" class="montage-alert-dialog"> | 77 | <div data-montage-id="alert-container" class="montage-alert-dialog"> |
83 | 78 | ||
84 | <div class="montage-popup-header"> | 79 | <div class="montage-popup-header"> |
85 | <h3 id="title" class="title"></h3> | 80 | <h3 data-montage-id="title" class="title"></h3> |
86 | </div> | 81 | </div> |
87 | 82 | ||
88 | <div class="montage-alert-content"> | 83 | <div class="montage-alert-content"> |
89 | <div id="msg" class="msg"></div> | 84 | <div data-montage-id="msg" class="msg"></div> |
90 | <div id="msg-detail" class="msg-detail"></div> | 85 | <div data-montage-id="msg-detail" class="msg-detail"></div> |
91 | </div> | 86 | </div> |
92 | 87 | ||
93 | <div class="montage-popup-footer"> | 88 | <div class="montage-popup-footer"> |
94 | <div class="montage-alert-actions"> | 89 | <div class="montage-alert-actions"> |
95 | <button class="submit" id="action-ok">OK</button> | 90 | <button class="submit" data-montage-id="action-ok">OK</button> |
96 | </div> | 91 | </div> |
97 | <div class="clearfix"></div> | 92 | <div class="clearfix"></div> |
98 | </div> | 93 | </div> |
diff --git a/node_modules/montage/ui/popup/confirm.reel/confirm.html b/node_modules/montage/ui/popup/confirm.reel/confirm.html index 5762f1ad..3e256b0e 100755 --- a/node_modules/montage/ui/popup/confirm.reel/confirm.html +++ b/node_modules/montage/ui/popup/confirm.reel/confirm.html | |||
@@ -11,8 +11,7 @@ | |||
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 | "prototype": "montage/ui/dynamic-text.reel", |
15 | "name": "DynamicText", | ||
16 | "properties": { | 15 | "properties": { |
17 | "element": { | 16 | "element": { |
18 | "#": "msg" | 17 | "#": "msg" |
@@ -23,8 +22,7 @@ | |||
23 | } | 22 | } |
24 | }, | 23 | }, |
25 | "button1": { | 24 | "button1": { |
26 | "module": "montage/ui/bluemoon/button.reel", | 25 | "prototype": "montage/ui/bluemoon/button.reel", |
27 | "name": "Button", | ||
28 | "properties": { | 26 | "properties": { |
29 | "identifier": "Ok", | 27 | "identifier": "Ok", |
30 | "element": { | 28 | "element": { |
@@ -44,8 +42,7 @@ | |||
44 | ] | 42 | ] |
45 | }, | 43 | }, |
46 | "button2": { | 44 | "button2": { |
47 | "module": "montage/ui/bluemoon/button.reel", | 45 | "prototype": "montage/ui/bluemoon/button.reel", |
48 | "name": "Button", | ||
49 | "properties": { | 46 | "properties": { |
50 | "identifier": "Cancel", | 47 | "identifier": "Cancel", |
51 | "element": { | 48 | "element": { |
@@ -65,8 +62,7 @@ | |||
65 | ] | 62 | ] |
66 | }, | 63 | }, |
67 | "owner": { | 64 | "owner": { |
68 | "module": "montage/ui/popup/confirm.reel", | 65 | "prototype": "montage/ui/popup/confirm.reel", |
69 | "name": "Confirm", | ||
70 | "properties": { | 66 | "properties": { |
71 | "element": { | 67 | "element": { |
72 | "#": "confirm-container" | 68 | "#": "confirm-container" |
@@ -79,21 +75,21 @@ | |||
79 | 75 | ||
80 | </head> | 76 | </head> |
81 | <body> | 77 | <body> |
82 | <div id="confirm-container" class="montage-confirm-dialog"> | 78 | <div data-montage-id="confirm-container" class="montage-confirm-dialog"> |
83 | 79 | ||
84 | <div class="montage-popup-header"> | 80 | <div class="montage-popup-header"> |
85 | <h3 id="title" class="title">Confirmation</h3> | 81 | <h3 data-montage-id="title" class="title">Confirmation</h3> |
86 | </div> | 82 | </div> |
87 | 83 | ||
88 | <div class="montage-confirm-content"> | 84 | <div class="montage-confirm-content"> |
89 | <div id="msg" class="msg"></div> | 85 | <div data-montage-id="msg" class="msg"></div> |
90 | <div id="msg-detail" class="msg-detail"></div> | 86 | <div data-montage-id="msg-detail" class="msg-detail"></div> |
91 | </div> | 87 | </div> |
92 | 88 | ||
93 | <div class="montage-popup-footer"> | 89 | <div class="montage-popup-footer"> |
94 | <div class="montage-confirm-actions"> | 90 | <div class="montage-confirm-actions"> |
95 | <button class="cancel" id="action-cancel">Cancel</button> | 91 | <button class="cancel" data-montage-id="action-cancel">Cancel</button> |
96 | <button class="submit" id="action-ok">OK</button> | 92 | <button class="submit" data-montage-id="action-ok">OK</button> |
97 | </div> | 93 | </div> |
98 | <div class="clearfix"></div> | 94 | <div class="clearfix"></div> |
99 | </div> | 95 | </div> |
diff --git a/node_modules/montage/ui/popup/notifier.reel/notifier.html b/node_modules/montage/ui/popup/notifier.reel/notifier.html index 71cd2608..3dfca6f6 100755 --- a/node_modules/montage/ui/popup/notifier.reel/notifier.html +++ b/node_modules/montage/ui/popup/notifier.reel/notifier.html | |||
@@ -11,8 +11,7 @@ | |||
11 | <script type="text/montage-serialization"> | 11 | <script type="text/montage-serialization"> |
12 | { | 12 | { |
13 | "owner": { | 13 | "owner": { |
14 | "module": "montage/ui/popup/notifier.reel", | 14 | "prototype": "montage/ui/popup/notifier.reel", |
15 | "name": "Notifier", | ||
16 | "properties": { | 15 | "properties": { |
17 | "element": { | 16 | "element": { |
18 | "#": "notifier-main" | 17 | "#": "notifier-main" |
@@ -28,8 +27,8 @@ | |||
28 | 27 | ||
29 | </head> | 28 | </head> |
30 | <body> | 29 | <body> |
31 | <div id="notifier-main" class="montage-notifier"> | 30 | <div data-montage-id="notifier-main" class="montage-notifier"> |
32 | <div id="notifier-msg" class="montage-notifier-msg"></div> | 31 | <div data-montage-id="notifier-msg" class="montage-notifier-msg"></div> |
33 | </div> | 32 | </div> |
34 | </body> |