diff options
author | Pushkar Joshi | 2012-06-04 10:37:29 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-06-04 10:37:29 -0700 |
commit | f1d75e5b29661abc4e173adc1f9de2e0cd91df83 (patch) | |
tree | 796931014054ad6b0647854183f632ffd72ed9ee /node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.html | |
parent | 06b609df1ff7833592faddbd8d7abb5b9f15a74d (diff) | |
parent | c1ec69879028220b0c3f11ad6e24035bf527802c (diff) | |
download | ninja-f1d75e5b29661abc4e173adc1f9de2e0cd91df83.tar.gz |
Merge branch 'master' into pentool
Conflicts:
js/tools/PenTool.js
Diffstat (limited to 'node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.html')
-rw-r--r-- | node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.html | 43 |
1 files changed, 20 insertions, 23 deletions
diff --git a/node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.html b/node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.html index 28c0ed1f..99a353b9 100644 --- a/node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.html +++ b/node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.html | |||
@@ -3,17 +3,16 @@ | |||
3 | <head> | 3 | <head> |
4 | <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> | 4 | <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> |
5 | <title>Feed Reader</title> | 5 | <title>Feed Reader</title> |
6 | 6 | ||
7 | <script type="text/javascript" src="https://www.google.com/jsapi?callback=initGoogleAPI"></script> | 7 | <script type="text/javascript" src="https://www.google.com/jsapi?callback=initGoogleAPI"></script> |
8 | 8 | ||
9 | <script type="text/montage-serialization"> | 9 | <script type="text/montage-serialization"> |
10 | { | 10 | { |
11 | "entriesController": { | 11 | "entriesController": { |
12 | "name": "ArrayController", | 12 | "prototype": "montage/ui/controller/array-controller", |
13 | "module": "montage/ui/controller/array-controller", | ||
14 | "properties": { | 13 | "properties": { |
15 | "selectObjectsOnAddition": true, | 14 | "selectObjectsOnAddition": true, |
16 | "automaticallyOrganizeObjects": true | 15 | "automaticallyOrganizeObjects": true |
17 | }, | 16 | }, |
18 | "bindings": { | 17 | "bindings": { |
19 | "content": { | 18 | "content": { |
@@ -23,10 +22,9 @@ | |||
23 | } | 22 | } |
24 | } | 23 | } |
25 | }, | 24 | }, |
26 | 25 | ||
27 | "feedEntry": { | 26 | "feedEntry": { |
28 | "module": "montage-google/feed-reader/feed-entry.reel", | 27 | "prototype": "montage-google/feed-reader/feed-entry.reel", |
29 | "name": "FeedEntry", | ||
30 | "properties": { | 28 | "properties": { |
31 | "element": {"#": "feed-entry"} | 29 | "element": {"#": "feed-entry"} |
32 | }, | 30 | }, |
@@ -36,17 +34,16 @@ | |||
36 | "boundObjectPropertyPath": "activeFeedEntry", | 34 | "boundObjectPropertyPath": "activeFeedEntry", |
37 | "oneway": true | 35 | "oneway": true |
38 | } | 36 | } |
39 | } | 37 | } |
40 | }, | 38 | }, |
41 | 39 | ||
42 | "owner": { | 40 | "owner": { |
43 | "module": "montage-google/feed-reader/feed-reader.reel", | 41 | "prototype": "montage-google/feed-reader/feed-reader.reel", |
44 | "name": "FeedReader", | ||
45 | "properties": { | 42 | "properties": { |
46 | "element": {"#": "feed-reader"} | 43 | "element": {"#": "feed-reader"} |
47 | } | 44 | } |
48 | } | 45 | } |
49 | 46 | ||
50 | } | 47 | } |
51 | </script> | 48 | </script> |
52 | 49 | ||
@@ -56,23 +53,23 @@ | |||
56 | height: 120px; | 53 | height: 120px; |
57 | width: 380px; | 54 | width: 380px; |
58 | } | 55 | } |
59 | 56 | ||
60 | .feed-entry { | 57 | .feed-entry { |
61 | } | 58 | } |
62 | 59 | ||
63 | 60 | ||
64 | </style> | 61 | </style> |
65 | 62 | ||
66 | 63 | ||
67 | </head> | 64 | </head> |
68 | <body> | 65 | <body> |
69 | <div class="feed-reader" id="feed-reader"> | 66 | <div class="feed-reader" data-montage-id="feed-reader"> |
70 | 67 | ||
71 | <div id="entries"> | 68 | <div data-montage-id="entries"> |
72 | <div class="feed-entry" id="feed-entry"></div> | 69 | <div class="feed-entry" data-montage-id="feed-entry"></div> |
73 | </div> | 70 | </div> |
74 | 71 | ||
75 | 72 | ||
76 | </div> | 73 | </div> |
77 | 74 | ||
78 | </body> | 75 | </body> |