aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xjs/controllers/document-controller.js2
-rw-r--r--js/data/panels-data.js4
-rwxr-xr-xjs/panels/Components/ComponentsPanel.js47
-rwxr-xr-xjs/panels/components-panel.reel/components-panel.css (renamed from js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.css)0
-rwxr-xr-xjs/panels/components-panel.reel/components-panel.html (renamed from js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.html)6
-rwxr-xr-xjs/panels/components-panel.reel/components-panel.js (renamed from js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js)2
-rw-r--r--node_modules/components-data/anchor.json25
-rw-r--r--node_modules/components-data/button.json35
-rw-r--r--node_modules/components-data/checkbox.json30
-rw-r--r--node_modules/components-data/image.json5
-rw-r--r--node_modules/components-data/number-input.json5
11 files changed, 15 insertions, 146 deletions
diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index a308f191..97ea834b 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -80,7 +80,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
80 handleAddComponentFirstDraw: { 80 handleAddComponentFirstDraw: {
81 value: function (e) { 81 value: function (e) {
82 //TODO: Add logic to reparse the document for dynamically added styles 82 //TODO: Add logic to reparse the document for dynamically added styles
83 console.log(e); 83 //console.log(e);
84 } 84 }
85 }, 85 },
86 86
diff --git a/js/data/panels-data.js b/js/data/panels-data.js
index 2422f5e7..7a2d817a 100644
--- a/js/data/panels-data.js
+++ b/js/data/panels-data.js
@@ -55,8 +55,8 @@ exports.PanelsData = Montage.create(Montage, {
55 scrollable: true, 55 scrollable: true,
56 collapsed: true, 56 collapsed: true,
57 open: true, 57 open: true,
58 modulePath: "js/panels/Components/ComponentsPanelBase.reel", 58 modulePath: "js/panels/components-panel.reel",
59 moduleName: "ComponentsPanelBase" 59 moduleName: "ComponentsPanel"
60 }, 60 },
61// { 61// {
62// name: "Project/Assets", 62// name: "Project/Assets",
diff --git a/js/panels/Components/ComponentsPanel.js b/js/panels/Components/ComponentsPanel.js
deleted file mode 100755
index df1d74bb..00000000
--- a/js/panels/Components/ComponentsPanel.js
+++ /dev/null
@@ -1,47 +0,0 @@
1/* <copyright>
2This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
3No 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
7var Montage = require("montage/core/core").Montage;
8
9var PanelBase = require("js/panels/PanelBase").PanelBase;
10var ComponentsPanelBase = require("js/panels/Components/ComponentsPanelBase.reel").ComponentsPanelBase;
11
12exports.ComponentsPanel = Montage.create(PanelBase, {
13 id : {value : "componentsPanel", writable:true, enumerable:true, configurable:true},
14 panelName : {value : "Components", writable:true, enumerable:true, configurable:true},
15 panelHeaderID : {value : "componentsPanelHeader", writable:true, enumerable:true, configurable:true},
16 disclosureIconID : {value : "componentsPanelDisclosureIcon", writable:true, enumerable:true, configurable:true},
17 closeButtonID : {value : "componentsPanelCloseButton", writable:true, enumerable:true, configurable:true},
18 panelContentID : {value : "componentsPanelContent", writable:true, enumerable:true, configurable:true},
19
20 init : {
21 value : function()
22 {
23 this.contentHeight = 200;
24 this.minHeight = 100;
25 this.defaultHeight = 200;
26
27 /* OLD WAY -- Removing the temporary div
28 // TODO: Remove this comment once this is tested.
29 var panelContainer = document.createElement("div");
30 this._componentsPanelBase = ComponentsPanelBase.create();
31 this._componentsPanelBase.element = panelContainer;
32
33 this.content = this._componentsPanelBase;
34 this._componentsPanelBase.needsDraw = true;
35 */
36
37 this.content = ComponentsPanelBase.create();
38 }
39 },
40
41 _componentsPanelBase:{
42 enumerable: true,
43 value: null,
44 writable:true
45 }
46
47}); \ No newline at end of file
diff --git a/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.css b/js/panels/components-panel.reel/components-panel.css
index ac250c83..ac250c83 100755
--- a/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.css
+++ b/js/panels/components-panel.reel/components-panel.css
diff --git a/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.html b/js/panels/components-panel.reel/components-panel.html
index 6d7c8a2c..f598a1ee 100755
--- a/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.html
+++ b/js/panels/components-panel.reel/components-panel.html
@@ -7,13 +7,13 @@
7<html lang="en"> 7<html lang="en">
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="ComponentsPanelBase.css"> 10 <link rel="stylesheet" type="text/css" href="components-panel.css">
11 11
12 <script type="text/montage-serialization"> 12 <script type="text/montage-serialization">
13 { 13 {
14 "owner": { 14 "owner": {
15 "module": "js/panels/Components/ComponentsPanelBase.reel", 15 "module": "js/panels/components-panel.reel",
16 "name": "ComponentsPanelBase", 16 "name": "ComponentsPanel",
17 "properties": { 17 "properties": {
18 "element": {"#": "components_panel"}, 18 "element": {"#": "components_panel"},
19 "controller": {"@": "componentsTree"} 19 "controller": {"@": "componentsTree"}
diff --git a/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js b/js/panels/components-panel.reel/components-panel.js
index 3505393c..9252b7b8 100755
--- a/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js
+++ b/js/panels/components-panel.reel/components-panel.js
@@ -16,7 +16,7 @@ String.prototype.capitalizeFirstChar = function() {
16}; 16};
17 17
18 18
19var ComponentsPanelBase = exports.ComponentsPanelBase = Montage.create(Component, { 19exports.ComponentsPanel = Montage.create(Component, {
20 20
21 components: { 21 components: {
22 value: { 22 value: {
diff --git a/node_modules/components-data/anchor.json b/node_modules/components-data/anchor.json
index 04faf04d..028a759b 100644
--- a/node_modules/components-data/anchor.json
+++ b/node_modules/components-data/anchor.json
@@ -18,29 +18,10 @@
18 "default": "" 18 "default": ""
19 }, 19 },
20 { 20 {
21 "name": "hreflang",
22 "type": "string",
23 "default": ""
24 },
25 {
26 "name": "media",
27 "type": "string",
28 "default": ""
29 },
30 {
31 "name": "rel",
32 "type": "string",
33 "default": ""
34 },
35 {
36 "name": "target", 21 "name": "target",
37 "type": "string", 22 "type": "select",
38 "default": "" 23 "default": "_self",
39 }, 24 "possibleValues": ["_self", "_blank", "_parent", "_top"]
40 {
41 "name": "type",
42 "type": "string",
43 "default": ""
44 } 25 }
45 ] 26 ]
46} \ No newline at end of file 27} \ No newline at end of file
diff --git a/node_modules/components-data/button.json b/node_modules/components-data/button.json
index 3f30030e..f3c16e8a 100644
--- a/node_modules/components-data/button.json
+++ b/node_modules/components-data/button.json
@@ -13,46 +13,11 @@
13 "default": "Button" 13 "default": "Button"
14 }, 14 },
15 { 15 {
16 "name": "autofocus",
17 "type": "boolean",
18 "default": "false"
19 },
20 {
21 "name": "enabled", 16 "name": "enabled",
22 "type": "boolean", 17 "type": "boolean",
23 "default": "true" 18 "default": "true"
24 }, 19 },
25 { 20 {
26 "name": "form",
27 "type": "string",
28 "default": ""
29 },
30 {
31 "name": "formaction",
32 "type": "string",
33 "default": ""
34 },
35 {
36 "name": "formenctype",
37 "type": "string",
38 "default": ""
39 },
40 {
41 "name": "formmethod",
42 "type": "string",
43 "default": ""
44 },
45 {
46 "name": "formnovalidate",
47 "type": "boolean",
48 "default": ""
49 },
50 {
51 "name": "formtarget",
52 "type": "string",
53 "default": ""
54 },
55 {
56 "name": "name", 21 "name": "name",
57 "type": "string", 22 "type": "string",
58 "default": "" 23 "default": ""
diff --git a/node_modules/components-data/checkbox.json b/node_modules/components-data/checkbox.json
index a03ee00f..cd851f67 100644
--- a/node_modules/components-data/checkbox.json
+++ b/node_modules/components-data/checkbox.json
@@ -8,11 +8,6 @@