diff options
| author | Eric Guzman | 2012-04-23 11:55:55 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-04-23 11:55:55 -0700 |
| commit | cdd1189e349e2974681e2c451e861e5b0db570e4 (patch) | |
| tree | d8823c3d050e011032c563d20c1a5f61e67ae740 /js/components/ui/row-renderer.reel | |
| parent | c0fce534c255ef1e25779e2f0e8de95bb4e160cf (diff) | |
| parent | 5a0331fc26fcc2cdc6200086109e34440a2dec6a (diff) | |
| download | ninja-cdd1189e349e2974681e2c451e861e5b0db570e4.tar.gz | |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Diffstat (limited to 'js/components/ui/row-renderer.reel')
| -rwxr-xr-x | js/components/ui/row-renderer.reel/row-renderer.html | 37 | ||||
| -rwxr-xr-x | js/components/ui/row-renderer.reel/row-renderer.js | 18 |
2 files changed, 0 insertions, 55 deletions
diff --git a/js/components/ui/row-renderer.reel/row-renderer.html b/js/components/ui/row-renderer.reel/row-renderer.html deleted file mode 100755 index f081eb84..00000000 --- a/js/components/ui/row-renderer.reel/row-renderer.html +++ /dev/null | |||
| @@ -1,37 +0,0 @@ | |||
| 1 | <!DOCTYPE html> | ||
| 2 | <!-- <copyright> | ||
| 3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
| 4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
| 5 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
| 6 | </copyright> --> | ||
| 7 | <html> | ||
| 8 | <head> | ||
| 9 | <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> | ||
| 10 | |||
| 11 | <script type="text/m-objects"> | ||
| 12 | { | ||
| 13 | "$rootObject": U("m-obj://Application/rootObject?mId=montage/application", { | ||
| 14 | "components": [ | ||
| 15 | U("m-obj://Repetition/repetition-uuid?mId=montage/ui/repetition", { | ||
| 16 | "element": E("#testList"), | ||
| 17 | "objects": [ | ||
| 18 | {type: "slider", value: 10}, | ||
| 19 | {type: "slider", value: 20}, | ||
| 20 | {type: "slider", value: 50} | ||
| 21 | ] | ||
| 22 | |||
| 23 | }) | ||
| 24 | ] | ||
| 25 | }) | ||
| 26 | } | ||
| 27 | </script> | ||
| 28 | |||
| 29 | </head> | ||
| 30 | <body> | ||
| 31 | |||
| 32 | <ul id="testList"> | ||
| 33 | <li id="substitution"></li> | ||
| 34 | </ul> | ||
| 35 | |||
| 36 | </body> | ||
| 37 | </html> | ||
diff --git a/js/components/ui/row-renderer.reel/row-renderer.js b/js/components/ui/row-renderer.reel/row-renderer.js deleted file mode 100755 index ba71ce12..00000000 --- a/js/components/ui/row-renderer.reel/row-renderer.js +++ /dev/null | |||
| @@ -1,18 +0,0 @@ | |||
| 1 | /* <copyright> | ||
| 2 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
| 3 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
| 4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
| 5 | </copyright> */ | ||
| 6 | |||
| 7 | var Montage = require("montage/core/core").Montage; | ||
| 8 | var Component = require("montage/ui/component").Component; | ||
| 9 | |||
| 10 | exports.RowRenderer = Montage.create(Component, { | ||
| 11 | |||
| 12 | objects : {value : null, writable: true, enumerable: true, configurable: true }, | ||
| 13 | |||
| 14 | axis: {value : null, writable: true, enumerable: true, configurable: true }, | ||
| 15 | |||
| 16 | mylist: {value : null, writable: true, enumerable: true, configurable: true } | ||
| 17 | |||
| 18 | }); | ||