diff options
author | Armen Kesablyan | 2012-06-19 01:03:59 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-06-19 01:03:59 -0700 |
commit | 2e13a73e4ee980a6f73f6ff48b2a195eb209a7db (patch) | |
tree | d352f5e769eae0e1b7b76ccbeafa9b174b1a9918 /node_modules/montage/ui/popup/confirm.reel | |
parent | 244e608645778746d1a3b5aa0d4c0868f7c5c272 (diff) | |
parent | c59eb371559a3061ce53223e249ca97daace5968 (diff) | |
download | ninja-2e13a73e4ee980a6f73f6ff48b2a195eb209a7db.tar.gz |
Merge branch 'refs/heads/master' into binding
Conflicts:
js/components/layout/tools-list.reel/tools-list.html
js/components/layout/tools-properties.reel/tools-properties.html
js/document/document-html.js
js/document/templates/app/main.js
js/panels/Panel.reel/Panel.js
node_modules/montage/ui/native-control.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'node_modules/montage/ui/popup/confirm.reel')
-rwxr-xr-x | node_modules/montage/ui/popup/confirm.reel/confirm.html | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/node_modules/montage/ui/popup/confirm.reel/confirm.html b/node_modules/montage/ui/popup/confirm.reel/confirm.html index 3e256b0e..1c9b7caf 100755 --- a/node_modules/montage/ui/popup/confirm.reel/confirm.html +++ b/node_modules/montage/ui/popup/confirm.reel/confirm.html | |||
@@ -11,7 +11,7 @@ | |||
11 | <script type="text/montage-serialization">{ | 11 | <script type="text/montage-serialization">{ |
12 | 12 | ||
13 | "dynamictext1": { | 13 | "dynamictext1": { |
14 | "prototype": "montage/ui/dynamic-text.reel", | 14 | "prototype": "ui/dynamic-text.reel", |
15 | "properties": { | 15 | "properties": { |
16 | "element": { | 16 | "element": { |
17 | "#": "msg" | 17 | "#": "msg" |
@@ -22,7 +22,7 @@ | |||
22 | } | 22 | } |
23 | }, | 23 | }, |
24 | "button1": { | 24 | "button1": { |
25 | "prototype": "montage/ui/bluemoon/button.reel", | 25 | "prototype": "ui/bluemoon/button.reel", |
26 | "properties": { | 26 | "properties": { |
27 | "identifier": "Ok", | 27 | "identifier": "Ok", |
28 | "element": { | 28 | "element": { |
@@ -42,7 +42,7 @@ | |||
42 | ] | 42 | ] |
43 | }, | 43 | }, |
44 | "button2": { | 44 | "button2": { |
45 | "prototype": "montage/ui/bluemoon/button.reel", | 45 | "prototype": "ui/bluemoon/button.reel", |
46 | "properties": { | 46 | "properties": { |
47 | "identifier": "Cancel", | 47 | "identifier": "Cancel", |
48 | "element": { | 48 | "element": { |
@@ -62,7 +62,7 @@ | |||
62 | ] | 62 | ] |
63 | }, | 63 | }, |
64 | "owner": { | 64 | "owner": { |
65 | "prototype": "montage/ui/popup/confirm.reel", | 65 | "prototype": "ui/popup/confirm.reel", |
66 | "properties": { | 66 | "properties": { |
67 | "element": { | 67 | "element": { |
68 | "#": "confirm-container" | 68 | "#": "confirm-container" |