aboutsummaryrefslogtreecommitdiff
path: root/node_modules
diff options
context:
space:
mode:
Diffstat (limited to 'node_modules')
-rw-r--r--node_modules/descriptor.json35
-rwxr-xr-xnode_modules/montage/ui/picasa-carousel.reel/picasa-carousel.html3
-rw-r--r--node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.js14
-rw-r--r--node_modules/tools/template-creator.js20
4 files changed, 57 insertions, 15 deletions
diff --git a/node_modules/descriptor.json b/node_modules/descriptor.json
index c460066c..e5606655 100644
--- a/node_modules/descriptor.json
+++ b/node_modules/descriptor.json
@@ -122,6 +122,32 @@
122 "data/sqlaccess/sqlstore.js", 122 "data/sqlaccess/sqlstore.js",
123 "data/store.js", 123 "data/store.js",
124 "data/transactionid.js", 124 "data/transactionid.js",
125 "examples/feed-reader/images/07-map-marker.png",
126 "examples/feed-reader/images/10-medical.png",
127 "examples/feed-reader/images/100-coffee.png",
128 "examples/feed-reader/images/107-widescreen.png",
129 "examples/feed-reader/images/125-food.png",
130 "examples/feed-reader/images/142-wine-bottle.png",
131 "examples/feed-reader/images/34-coffee.png",
132 "examples/feed-reader/images/35-shopping.png",
133 "examples/feed-reader/images/38-airplane.png",
134 "examples/feed-reader/images/41-picture-frame.png",
135 "examples/feed-reader/images/47-fuel.png",
136 "examples/feed-reader/images/48-fork-and-knife.png",
137 "examples/feed-reader/images/80-shopping-cart.png",
138 "examples/feed-reader/images/87-wine-glass.png",
139 "examples/feed-reader/images/88-beer-mug.png",
140 "examples/feed-reader/index.html",
141 "examples/feed-reader/main.reel/main.html",
142 "examples/feed-reader/main.reel/main.js",
143 "examples/feed-reader/map-example.reel/main.css",
144 "examples/feed-reader/map-example.reel/main.html",
145 "examples/feed-reader/map-example.reel/main.js",
146 "examples/feed-reader/package.json",
147 "examples/youtube-channel-example/index.html",
148 "examples/youtube-channel-example/package.json",
149 "examples/youtube-channel-example/style.css",
150 "examples/youtube-channel-example/youtube-channel-example.js",
125 "montage.js", 151 "montage.js",
126 "node.js", 152 "node.js",
127 "package.json", 153 "package.json",
@@ -169,6 +195,7 @@
169 "ui/component.js", 195 "ui/component.js",
170 "ui/composer/composer.js", 196 "ui/composer/composer.js",
171 "ui/composer/long-press-composer.js", 197 "ui/composer/long-press-composer.js",
198 "ui/composer/press-composer.js",
172 "ui/composer/swipe-composer.js", 199 "ui/composer/swipe-composer.js",
173 "ui/composer/translate-composer.js", 200 "ui/composer/translate-composer.js",
174 "ui/condition.reel/condition.js", 201 "ui/condition.reel/condition.js",
@@ -219,21 +246,19 @@
219 "ui/popup/popup.reel/popup.css", 246 "ui/popup/popup.reel/popup.css",
220 "ui/popup/popup.reel/popup.html", 247 "ui/popup/popup.reel/popup.html",
221 "ui/popup/popup.reel/popup.js", 248 "ui/popup/popup.reel/popup.js",
222 "ui/progress.reel/progress.css",
223 "ui/progress.reel/progress.html",
224 "ui/progress.reel/progress.js", 249 "ui/progress.reel/progress.js",
225 "ui/progress.reel/rule.png",
226 "ui/progress.reel/scroll.png",
227 "ui/radio-button.reel/radio-button.js", 250 "ui/radio-button.reel/radio-button.js",
228 "ui/range-input.reel/range-input.js", 251 "ui/range-input.reel/range-input.js",
229 "ui/repetition.reel/repetition.js", 252 "ui/repetition.reel/repetition.js",
230 "ui/scroll-bars.reel/scroll-bars.html", 253 "ui/scroll-bars.reel/scroll-bars.html",
231 "ui/scroll-bars.reel/scroll-bars.js", 254 "ui/scroll-bars.reel/scroll-bars.js",
232 "ui/scroll.js",
233 "ui/scroller.reel/scroller.html", 255 "ui/scroller.reel/scroller.html",
234 "ui/scroller.reel/scroller.js", 256 "ui/scroller.reel/scroller.js",
235 "ui/scrollview.reel/scrollview.js", 257 "ui/scrollview.reel/scrollview.js",
236 "ui/select-input.reel/select-input.js", 258 "ui/select-input.reel/select-input.js",
259 "ui/skeleton/range-input.reel/range-input.css",
260 "ui/skeleton/range-input.reel/range-input.html",
261 "ui/skeleton/range-input.reel/range-input.js",
237 "ui/slot.reel/slot.js", 262 "ui/slot.reel/slot.js",
238 "ui/substitution.reel/substitution.js", 263 "ui/substitution.reel/substitution.js",
239 "ui/tabs.reel/tabs.css", 264 "ui/tabs.reel/tabs.css",
diff --git a/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.html b/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.html
index 6774026b..34f207b4 100755
--- a/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.html
+++ b/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.html
@@ -15,7 +15,8 @@
15 "prototype": "montage/ui/picasa-carousel.reel", 15 "prototype": "montage/ui/picasa-carousel.reel",
16 "properties": { 16 "properties": {
17 "element": {"#": "montage-google-picasa-carousel"}, 17 "element": {"#": "montage-google-picasa-carousel"},
18 "searchResultsList": {"@": "searchResultsList"} 18 "searchResultsList": {"@": "searchResultsList"},
19 "flow": {"@": "flow1"}
19 } 20 }
20 }, 21 },
21 "searchResultsController": { 22 "searchResultsController": {
diff --git a/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.js b/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.js
index 1f5e7dd0..b41df9a6 100644
--- a/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.js
+++ b/node_modules/montage/ui/picasa-carousel.reel/picasa-carousel.js
@@ -20,6 +20,16 @@ var PicasaCarousel = exports.PicasaCarousel = Montage.create(Component, /** @len
20 value: null 20 value: null
21 }, 21 },
22 22
23 flow: {
24 value: null
25 },
26
27 initialPosition: {
28 value: 2300
29 },
30
31
32
23 _queryParameter: { 33 _queryParameter: {
24 enumerable: false, 34 enumerable: false,
25 value: null 35 value: null
@@ -37,7 +47,7 @@ var PicasaCarousel = exports.PicasaCarousel = Montage.create(Component, /** @len
37 47
38 resultCount: { 48 resultCount: {
39 enumerable: false, 49 enumerable: false,
40 value: 20 50 value: 40
41 }, 51 },
42 52
43 prepareForDraw: { 53 prepareForDraw: {
@@ -103,6 +113,8 @@ var PicasaCarousel = exports.PicasaCarousel = Montage.create(Component, /** @len
103 value: function(evt) { 113 value: function(evt) {
104 var response = JSON.parse(evt.target.responseText); 114 var response = JSON.parse(evt.target.responseText);
105 this.searchResults = response.feed.entry; 115 this.searchResults = response.feed.entry;
116 this.flow.length = this.initialPosition;
117 this.flow.origin = this.initialPosition;
106 this.isSearching = false; 118 this.isSearching = false;
107 } 119 }
108 }, 120 },
diff --git a/node_modules/tools/template-creator.js b/node_modules/tools/template-creator.js
index 6b50cc1e..e312cd32 100644
--- a/node_modules/tools/template-creator.js
+++ b/node_modules/tools/template-creator.js
@@ -31,18 +31,19 @@ var TemplateCreator = exports.TemplateCreator = Montage.create(Template, /** @le
31 }, 31 },
32 32
33 initWithHeadAndBodyElements: { 33 initWithHeadAndBodyElements: {
34 value: function(head, body, montageJsPath) { 34 value: function(head, body, components, montageJsPath) {
35 var serializer = this.serializer, 35 var serializer = this.serializer,
36 objects = {}, 36 objects = {},
37 components = {}, 37 //components = {},
38 doc, 38 doc,
39 script, 39 script,
40 self = this; 40 self = this;
41 41
42 this._objectNamesIndex = {}; 42 this._objectNamesIndex = {};
43 doc = this._document = document.implementation.createHTMLDocument(""); 43 //doc = this._document = document.implementation.createHTMLDocument("");
44 44
45 function copyNode(sourceNode, targetNode, isRootNode) { 45 /*
46function copyNode(sourceNode, targetNode, isRootNode) {
46 var childNodes = sourceNode.childNodes, 47 var childNodes = sourceNode.childNodes,
47 childNode, 48 childNode,
48 targetChildNode, 49 targetChildNode,
@@ -54,7 +55,7 @@ var TemplateCreator = exports.TemplateCreator = Montage.create(Template, /** @le
54 label = self._generateLabelForComponent(component); 55 label = self._generateLabelForComponent(component);
55 targetNode.setAttribute("id", label); 56 targetNode.setAttribute("id", label);
56 component._element = targetNode; 57 component._element = targetNode;
57 components[label] = component; 58 //components[label] = component;
58 } else { 59 } else {
59 for (var i = 0; (childNode = childNodes[i]); i++) { 60 for (var i = 0; (childNode = childNodes[i]); i++) {
60 targetChildNode = targetNode.appendChild(childNode.cloneNode(false)); 61 targetChildNode = targetNode.appendChild(childNode.cloneNode(false));
@@ -62,8 +63,10 @@ var TemplateCreator = exports.TemplateCreator = Montage.create(Template, /** @le
62 } 63 }
63 } 64 }
64 } 65 }
66*/
65 67
66 if (head) { 68 /*
69if (head) {
67 doc.head.innerHTML = head.innerHTML; 70 doc.head.innerHTML = head.innerHTML;
68 } 71 }
69 if (montageJsPath) { 72 if (montageJsPath) {
@@ -82,11 +85,12 @@ var TemplateCreator = exports.TemplateCreator = Montage.create(Template, /** @le
82 // the first child is the title 85 // the first child is the title
83 doc.head.insertBefore(doc.createTextNode("\n "), doc.head.firstChild); 86 doc.head.insertBefore(doc.createTextNode("\n "), doc.head.firstChild);
84 } 87 }
88*/
85 89
86 copyNode(body, this._document.body, true); 90 //copyNode(body, this._document.body, true);
87 this._ownerSerialization = serializer.serialize(components); 91 this._ownerSerialization = serializer.serialize(components);
88 this._externalObjects = serializer.getExternalObjects(); 92 this._externalObjects = serializer.getExternalObjects();
89 93
90 return this; 94 return this;
91 } 95 }