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/notifier.reel | |
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/notifier.reel')
-rwxr-xr-x | node_modules/montage/ui/popup/notifier.reel/notifier.html | 2 | ||||
-rwxr-xr-x | node_modules/montage/ui/popup/notifier.reel/notifier.js | 6 |
2 files changed, 5 insertions, 3 deletions
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 |