aboutsummaryrefslogtreecommitdiff
path: root/node_modules/montage/ui/popup
diff options
context:
space:
mode:
authorValerio Virgillito2012-04-18 13:48:51 -0700
committerValerio Virgillito2012-04-18 13:48:51 -0700
commit2e04af953463643791f6362bd8ef4c6ba190abfa (patch)
treed07aaf646091ddf9dad5b030a7905055fd323490 /node_modules/montage/ui/popup
parent616a8532099fec2a15855eac97cd85cb60c4451c (diff)
downloadninja-2e04af953463643791f6362bd8ef4c6ba190abfa.tar.gz
Squashed commit of the following:
commit 2054551bfb01a0f4ca2e138b9d724835462d45cd Merge: 765c2da 616a853 Author: Valerio Virgillito <valerio@motorola.com> Date: Wed Apr 18 13:48:21 2012 -0700 Merge branch 'refs/heads/master' into integration commit 765c2da8e1aa03550caf42b2bd5f367555ad2843 Author: Valerio Virgillito <valerio@motorola.com> Date: Tue Apr 17 15:29:41 2012 -0700 updating the picasa carousel Signed-off-by: Valerio Virgillito <valerio@motorola.com> commit 9484f1c82b81e27edf2dc0a1bcc1fa3b12077406 Merge: d27f2df cacb4a2 Author: Valerio Virgillito <valerio@motorola.com> Date: Tue Apr 17 15:03:50 2012 -0700 Merge branch 'refs/heads/master' into integration commit d27f2df4d846064444263d7832d213535962abe7 Author: Valerio Virgillito <valerio@motorola.com> Date: Wed Apr 11 10:39:36 2012 -0700 integrating new picasa carousel component Signed-off-by: Valerio Virgillito <valerio@motorola.com> commit 6f98384c9ecbc8abe55ccfe1fc25a0c7ce22c493 Author: Valerio Virgillito <valerio@motorola.com> Date: Tue Apr 10 14:33:00 2012 -0700 fixed the text area case issue Text area was renamed from TextArea to Textarea Signed-off-by: Valerio Virgillito <valerio@motorola.com> commit 1e83e26652266136802bc7af930379c1ecd631a6 Author: Valerio Virgillito <valerio@motorola.com> Date: Mon Apr 9 22:10:45 2012 -0700 integrating montage v0.8 into ninja. Signed-off-by: Valerio Virgillito <valerio@motorola.com> Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'node_modules/montage/ui/popup')
-rwxr-xr-xnode_modules/montage/ui/popup/alert.reel/alert.html32
-rwxr-xr-xnode_modules/montage/ui/popup/confirm.reel/confirm.html32
-rwxr-xr-xnode_modules/montage/ui/popup/notifier.reel/notifier.js4
-rwxr-xr-xnode_modules/montage/ui/popup/popup.reel/popup.js135
4 files changed, 103 insertions, 100 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>
diff --git a/node_modules/montage/ui/popup/confirm.reel/confirm.html b/node_modules/montage/ui/popup/confirm.reel/confirm.html
index 63b521bd..5762f1ad 100755
--- a/node_modules/montage/ui/popup/confirm.reel/confirm.html
+++ b/node_modules/montage/ui/popup/confirm.reel/confirm.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="confirm.css"> 10 <link rel="stylesheet" type="text/css" href="confirm.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.msg"}
23 "boundObject": {
24 "@": "owner"
25 },
26 "boundObjectPropertyPath": "msg",
27 "oneway": true
28 }
29 } 23 }
30 }, 24 },
31 "button1": { 25 "button1": {
@@ -38,13 +32,7 @@
38 } 32 }
39 }, 33 },
40 "bindings": { 34 "bindings": {
41 "value": { 35 "value": {"<-": "@owner.okLabel"}
42 "boundObject": {
43 "@": "owner"
44 },
45 "boundObjectPropertyPath": "okLabel",
46 "oneway": true
47 }
48 }, 36 },
49 "listeners": [ 37 "listeners": [
50 { 38 {
@@ -65,13 +53,7 @@
65 } 53 }
66 }, 54 },
67 "bindings": { 55 "bindings": {
68 "value": { 56 "value": {"<-": "@owner.cancelLabel"}
69 "boundObject": {
70 "@": "owner"
71 },
72 "boundObjectPropertyPath": "cancelLabel",
73 "oneway": true
74 }
75 }, 57 },
76 "listeners": [ 58 "listeners": [
77 { 59 {
@@ -91,8 +73,8 @@
91 } 73 }
92 } 74 }
93 } 75 }
94} 76
95 </script> 77 }</script>
96 78
97 79
98 </head> 80 </head>
diff --git a/node_modules/montage/ui/popup/notifier.reel/notifier.js b/node_modules/montage/ui/popup/notifier.reel/notifier.js
index 6346cd19..ac3dcff9 100755
--- a/node_modules/montage/ui/popup/notifier.reel/notifier.js
+++ b/node_modules/montage/ui/popup/notifier.reel/notifier.js
@@ -78,14 +78,12 @@ var Notifier = exports.Notifier = Montage.create(Component, /** @lends module:"m
78 popup = Popup.create(); 78 popup = Popup.create();
79 this.popup = popup; 79 this.popup = popup;
80 popup.type = 'notify'; 80 popup.type = 'notify';
81 popup.boxed = false;
82 this.application._notifyPopup = popup; 81 this.application._notifyPopup = popup;
83 82
84 notifier = Notifier.create(); 83 notifier = Notifier.create();
85 popup.content = notifier; 84 popup.content = notifier;
86 } 85 }
87 notifier = popup.content; 86 notifier = popup.content;
88 //popup.modal = !!modal;
89 notifier.msg = msg; 87 notifier.msg = msg;
90 88
91 if (!position) { 89 if (!position) {
@@ -100,7 +98,7 @@ var Notifier = exports.Notifier = Montage.create(Component, /** @lends module:"m
100 98
101 if(timeout) { 99 if(timeout) {
102 timeout = parseInt(timeout, 10) || 3000; 100 timeout = parseInt(timeout, 10) || 3000;
103 popup.autoDismiss = timeout; 101 popup.autoHide = timeout;
104 } 102 }
105 103
106 popup.show(); 104 popup.show();
diff --git a/node_modules/montage/ui/popup/popup.reel/popup.js b/node_modules/montage/ui/popup/popup.reel/popup.js
index 2a61e75e..d0a7a1cc 100755
--- a/node_modules/montage/ui/popup/popup.reel/popup.js
+++ b/node_modules/montage/ui/popup/popup.reel/popup.js
@@ -21,8 +21,29 @@ var Popup = exports.Popup = Montage.create(Component, { /** @lends module:"modul
21 21
22 hasTemplate: {value: true}, 22 hasTemplate: {value: true},
23 23
24 // anchor element to which this popup must be anchored to 24 // the HTML Element to which the popup must be anchored to
25 anchor: {value: null}, 25 anchorElement: {value: null},
26
27 _anchor: {value: null},
28 /**
29 * The HTMLElement or Montage Component that the popup must be anchored to