diff options
author | Nivesh Rajbhandari | 2012-06-13 13:51:39 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-06-13 13:51:39 -0700 |
commit | 263ecfc95bd7eb5c726cd5688c3d74eb10296811 (patch) | |
tree | 7c907dd58e9b4f4a1d4802d8d22b9c84d3c2edf3 /node_modules/montage/ui/popup | |
parent | 1bb2778224982aea7b9781c6559bb659983a400f (diff) | |
parent | a827f2769d75848c0ba0bff03a927c1f2706322b (diff) | |
download | ninja-263ecfc95bd7eb5c726cd5688c3d74eb10296811.tar.gz |
Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixes
Conflicts:
js/panels/properties.reel/sections/position-size.reel/position-size.html
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'node_modules/montage/ui/popup')
6 files changed, 43 insertions, 28 deletions
diff --git a/node_modules/montage/ui/popup/alert.reel/alert.html b/node_modules/montage/ui/popup/alert.reel/alert.html index 5046d78f..2f35ff30 100755 --- a/node_modules/montage/ui/popup/alert.reel/alert.html +++ b/node_modules/montage/ui/popup/alert.reel/alert.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 | "#": "title" | 17 | "#": "title" |
@@ -22,7 +22,7 @@ | |||
22 | } | 22 | } |
23 | }, | 23 | }, |
24 | "dynamictext2": { | 24 | "dynamictext2": { |
25 | "prototype": "montage/ui/dynamic-text.reel", | 25 | "prototype": "ui/dynamic-text.reel", |
26 | "properties": { | 26 | "properties": { |
27 | "element": { | 27 | "element": { |
28 | "#": "msg" | 28 | "#": "msg" |
@@ -33,7 +33,7 @@ | |||
33 | } | 33 | } |
34 | }, | 34 | }, |
35 | "dynamictext3": { | 35 | "dynamictext3": { |
36 | "prototype": "montage/ui/dynamic-text.reel", | 36 | "prototype": "ui/dynamic-text.reel", |
37 | "properties": { | 37 | "properties": { |
38 | "element": { | 38 | "element": { |
39 | "#": "msg-detail" | 39 | "#": "msg-detail" |
@@ -44,7 +44,7 @@ | |||
44 | } | 44 | } |
45 | }, | 45 | }, |
46 | "button1": { | 46 | "button1": { |
47 | "prototype": "montage/ui/bluemoon/button.reel", | 47 | "prototype": "ui/bluemoon/button.reel", |
48 | "properties": { | 48 | "properties": { |
49 | "identifier": "Ok", | 49 | "identifier": "Ok", |
50 | "element": { | 50 | "element": { |
@@ -61,7 +61,7 @@ | |||
61 | ] | 61 | ] |
62 | }, | 62 | }, |
63 | "owner": { | 63 | "owner": { |
64 | "prototype": "montage/ui/popup/alert.reel", | 64 | "prototype": "ui/popup/alert.reel", |
65 | "properties": { | 65 | "properties": { |
66 | "element": { | 66 | "element": { |
67 | "#": "alert-container" | 67 | "#": "alert-container" |
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" |
diff --git a/node_modules/montage/ui/popup/notifier.reel/notifier.html b/node_modules/montage/ui/popup/notifier.reel/notifier.html index 3dfca6f6..09fe57ac 100755 --- a/node_modules/montage/ui/popup/notifier.reel/notifier.html +++ b/node_modules/montage/ui/popup/notifier.reel/notifier.html | |||
@@ -11,7 +11,7 @@ | |||
11 | <script type="text/montage-serialization"> | 11 | <script type="text/montage-serialization"> |
12 | { | 12 | { |
13 | "owner": { | 13 | "owner": { |
14 | "prototype": "montage/ui/popup/notifier.reel", | 14 | "prototype": "ui/popup/notifier.reel", |
15 | "properties": { | 15 | "properties": { |
16 | "element": { | 16 | "element": { |
17 | "#": "notifier-main" | 17 | "#": "notifier-main" |
diff --git a/node_modules/montage/ui/popup/notifier.reel/notifier.js b/node_modules/montage/ui/popup/notifier.reel/notifier.js index ac3dcff9..c0878e65 100755 --- a/node_modules/montage/ui/popup/notifier.reel/notifier.js +++ b/node_modules/montage/ui/popup/notifier.reel/notifier.js | |||
@@ -20,9 +20,11 @@ var Popup = require("ui/popup/popup.reel").Popup; | |||
20 | */ | 20 | */ |
21 | 21 | ||
22 | var Notifier = exports.Notifier = Montage.create(Component, /** @lends module:"montage/ui/popup/notifier.reel".Notifier# */ { | 22 | var Notifier = exports.Notifier = Montage.create(Component, /** @lends module:"montage/ui/popup/notifier.reel".Notifier# */ { |
23 | hasTemplate: {value: true}, | ||
24 | 23 | ||
25 | _msgEl: {value: null}, | 24 | _msgEl: { |
25 | value: null, | ||
26 | serializable: true | ||
27 | }, | ||
26 | /** | 28 | /** |
27 | Description TODO | 29 | Description TODO |
28 | @private | 30 | @private |
diff --git a/node_modules/montage/ui/popup/popup.reel/popup.html b/node_modules/montage/ui/popup/popup.reel/popup.html index 5bc74dae..140d7850 100755 --- a/node_modules/montage/ui/popup/popup.reel/popup.html +++ b/node_modules/montage/ui/popup/popup.reel/popup.html | |||
@@ -11,7 +11,7 @@ | |||
11 | <script type="text/montage-serialization"> | 11 | <script type="text/montage-serialization"> |
12 | { | 12 | { |
13 | "slot1": { | 13 | "slot1": { |
14 | "prototype": "montage/ui/slot.reel", | 14 | "prototype": "ui/slot.reel", |
15 | "properties": { | 15 | "properties": { |
16 | "element": { | 16 | "element": { |
17 | "#": "popup-content" | 17 | "#": "popup-content" |
@@ -19,7 +19,7 @@ | |||
19 | } | 19 | } |
20 | }, | 20 | }, |
21 | "owner": { | 21 | "owner": { |
22 | "prototype": "montage/ui/popup/popup.reel", | 22 | "prototype": "ui/popup/popup.reel", |
23 | "properties": { | 23 | "properties": { |
24 | "element": { | 24 | "element": { |
25 | "#": "popup-container" | 25 | "#": "popup-container" |
diff --git a/node_modules/montage/ui/popup/popup.reel/popup.js b/node_modules/montage/ui/popup/popup.reel/popup.js index 84f845db..0ed1a452 100755 --- a/node_modules/montage/ui/popup/popup.reel/popup.js +++ b/node_modules/montage/ui/popup/popup.reel/popup.js | |||
@@ -22,9 +22,14 @@ var Popup = exports.Popup = Montage.create(Component, { /** @lends module:"modul | |||
22 | hasTemplate: {value: true}, | 22 | hasTemplate: {value: true}, |
23 | 23 | ||
24 | // the HTML Element to which the popup must be anchored to | 24 | // the HTML Element to which the popup must be anchored to |
25 | anchorElement: {value: null}, | 25 | anchorElement: { |
26 | value: null | ||
27 | }, | ||
28 | |||
29 | _anchor: { | ||
30 | value: null | ||
31 | }, | ||
26 | 32 | ||
27 | _anchor: {value: null}, | ||
28 | /** | 33 | /** |
29 | * The HTMLElement or Montage Component that the popup must be anchored to | 34 | * The HTMLElement or Montage Component that the popup must be anchored to |
30 | */ | 35 | */ |
@@ -42,7 +47,8 @@ var Popup = exports.Popup = Montage.create(Component, { /** @lends module:"modul | |||
42 | this.anchorElement = value.element; | 47 | this.anchorElement = value.element; |
43 | } | 48 | } |
44 | } | 49 | } |
45 | } | 50 | }, |
51 | serializable: true | ||
46 | }, | 52 | }, |
47 | 53 | ||
48 | // A Delegate to control positioning (and other features, in future) of the popup in a custom manner | 54 | // A Delegate to control positioning (and other features, in future) of the popup in a custom manner |
@@ -53,7 +59,8 @@ var Popup = exports.Popup = Montage.create(Component, { /** @lends module:"modul | |||
53 | @private | 59 | @private |
54 | */ | 60 | */ |
55 | contentEl: { | 61 | contentEl: { |
56 | value: null | 62 | value: null, |
63 | serializable: true | ||
57 | }, | 64 | }, |
58 | /** | 65 | /** |
59 | Description TODO | 66 | Description TODO |
@@ -62,7 +69,8 @@ var Popup = exports.Popup = Montage.create(Component, { /** @lends module:"modul | |||