From 6b9bfb63f6bc22ef1095dc11816826bb83a2c408 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Mon, 26 Mar 2012 15:55:38 -0700 Subject: Cleanup of the components panel Renamed to naming convention. Deleted un-used file. Signed-off-by: Valerio Virgillito --- js/data/panels-data.js | 4 +- js/panels/Components/ComponentsPanel.js | 47 --- .../ComponentsPanelBase.css | 11 - .../ComponentsPanelBase.html | 65 ---- .../ComponentsPanelBase.js | 423 --------------------- .../components-panel.reel/components-panel.css | 11 + .../components-panel.reel/components-panel.html | 65 ++++ .../components-panel.reel/components-panel.js | 423 +++++++++++++++++++++ 8 files changed, 501 insertions(+), 548 deletions(-) delete mode 100755 js/panels/Components/ComponentsPanel.js delete mode 100755 js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.css delete mode 100755 js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.html delete mode 100755 js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js create mode 100755 js/panels/components-panel.reel/components-panel.css create mode 100755 js/panels/components-panel.reel/components-panel.html create mode 100755 js/panels/components-panel.reel/components-panel.js 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, { scrollable: true, collapsed: true, open: true, - modulePath: "js/panels/Components/ComponentsPanelBase.reel", - moduleName: "ComponentsPanelBase" + modulePath: "js/panels/components-panel.reel", + moduleName: "ComponentsPanel" }, // { // 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 @@ -/* -This file contains proprietary software owned by Motorola Mobility, Inc.
-No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
-(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. -
*/ - -var Montage = require("montage/core/core").Montage; - -var PanelBase = require("js/panels/PanelBase").PanelBase; -var ComponentsPanelBase = require("js/panels/Components/ComponentsPanelBase.reel").ComponentsPanelBase; - -exports.ComponentsPanel = Montage.create(PanelBase, { - id : {value : "componentsPanel", writable:true, enumerable:true, configurable:true}, - panelName : {value : "Components", writable:true, enumerable:true, configurable:true}, - panelHeaderID : {value : "componentsPanelHeader", writable:true, enumerable:true, configurable:true}, - disclosureIconID : {value : "componentsPanelDisclosureIcon", writable:true, enumerable:true, configurable:true}, - closeButtonID : {value : "componentsPanelCloseButton", writable:true, enumerable:true, configurable:true}, - panelContentID : {value : "componentsPanelContent", writable:true, enumerable:true, configurable:true}, - - init : { - value : function() - { - this.contentHeight = 200; - this.minHeight = 100; - this.defaultHeight = 200; - - /* OLD WAY -- Removing the temporary div - // TODO: Remove this comment once this is tested. - var panelContainer = document.createElement("div"); - this._componentsPanelBase = ComponentsPanelBase.create(); - this._componentsPanelBase.element = panelContainer; - - this.content = this._componentsPanelBase; - this._componentsPanelBase.needsDraw = true; - */ - - this.content = ComponentsPanelBase.create(); - } - }, - - _componentsPanelBase:{ - enumerable: true, - value: null, - writable:true - } - -}); \ No newline at end of file diff --git a/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.css b/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.css deleted file mode 100755 index ac250c83..00000000 --- a/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.css +++ /dev/null @@ -1,11 +0,0 @@ -/* - This file contains proprietary software owned by Motorola Mobility, Inc.
- No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
- (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. -
*/ - -.treeHolder{ - width: 227px; - background: red; - padding-left: 13px; -} diff --git a/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.html b/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.html deleted file mode 100755 index 6d7c8a2c..00000000 --- a/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.html +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - - -
-
-
- - - \ No newline at end of file diff --git a/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js b/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js deleted file mode 100755 index 3505393c..00000000 --- a/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js +++ /dev/null @@ -1,423 +0,0 @@ -/* -This file contains proprietary software owned by Motorola Mobility, Inc.
-No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
-(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. -
*/ - -var Montage = require("montage/core/core").Montage, - Component = require("montage/ui/component").Component, - NJUtils = require("js/lib/NJUtils").NJUtils; - -var treeControlModule = require("js/components/tree.reel"); -var PIData = require("js/data/pi/pi-data").PiData; - -String.prototype.capitalizeFirstChar = function() { - return this.charAt(0).toUpperCase() + this.slice(1); -}; - - -var ComponentsPanelBase = exports.ComponentsPanelBase = Montage.create(Component, { - - components: { - value: { - "text": "styles", - "children": [ - { - "text": "Widgets", - "children": [ - { - "text": "Feed Reader", - "dataFile" : "node_modules/components-data/feed-reader.json", - "component": "feedreader" - }, - { - "text": "Map", - "dataFile" : "node_modules/components-data/map.json", - "component": "map" - }, - { - "text": "Picasa Carousel", - "dataFile" : "node_modules/components-data/picasa-carousel.json", - "component": "picasa-carousel" - }, - { - "text": "Search Bar", - "dataFile" : "node_modules/components-data/searchfield.json", - "component": "searchfield" - }, - { - "text": "Youtube Channel", - "dataFile" : "node_modules/components-data/youtube-channel.json", - "component": "youtube-channel" - } - ] - }, - { - "text": "Montage Components", - "children": [ - { - "text": "Anchor", - "dataFile" : "node_modules/components-data/anchor.json", - "component": "anchor" - }, - { - "text": "Button", - "dataFile" : "node_modules/components-data/button.json", - "component": "button" - }, - { - "text": "Checkbox", - "dataFile" : "node_modules/components-data/checkbox.json", - "component": "checkbox" - }, - { - "text": "Image Component", - "dataFile" : "node_modules/components-data/image.json", - "component": "imageComponent" - }, - { - "text": "NumberInput", - "dataFile" : "node_modules/components-data/number-input.json", - "component": "numberInput" - }, - { - "text": "Select Input", - "dataFile" : "node_modules/components-data/select.json", - "component": "select" - }, - { - "text": "Radio Button", - "dataFile" : "node_modules/components-data/radio-button.json", - "component": "radioButton" - }, - { - "text": "Range Input", - "dataFile" : "node_modules/components-data/range-input.json", - "component": "rangeInput" - }, - { - "text": "TextArea", - "dataFile" : "node_modules/components-data/textarea.json", - "component": "textarea" - }, - { - "text": "Textfield", - "dataFile" : "node_modules/components-data/textfield.json", - "component": "textfield" - }, - { - "text": "Toogle Button", - "dataFile" : "node_modules/components-data/toggle-button.json", - "component": "toggleButton" - } - ] - } - ] - } - }, - - componentsData: { - value: {} - }, - - componentsToLoad: { - value: null - }, - - componentsLoaded: { - value: 0 - }, - - dragComponent: { - value: null - }, - - dragPosition: { - value: null - }, - - centerStage: { - value: null - }, - - - /********************************************************************* - * Components Tree and Model Creation - *********************************************************************/ - - didCreate: { - value: function() { - // Setup the drop delegate - this.application.ninja.dragDropMediator.dropDelegate = this; - // Loop through the component and load the JSON data for them - this._loadComponents(); - } - }, - - // Load all the data files for each component - // TODO: Implement the error case - _loadComponents: { - value: function() { - - for(var cat in this.components.children) { - - this.componentsToLoad += this.components.children[cat].children.length; - - for(var i = 0, component; component = this.components.children[cat].children[i]; i++) { - var req = new XMLHttpRequest(); - //req.identifier = "searchRequest"; - req.open("GET", component.dataFile); - req.addEventListener("load", this, false); - req.addEventListener("error", this, false); - req.send(); - } - - } - } - }, - - handleLoad: { - value: function(evt) { - var componentData, component, piID, piObj, section; - - componentData = JSON.parse(evt.target.responseText); - - component = componentData.name; - - // Build the PI data and create a new object for Ninja PI - piID = component + "Pi"; - piObj = []; - section = {}; - section.label = component + " Properties"; - section.Section = []; - - for(var j = 0, props; props = componentData.properties[j]; j++) { - var row = {}; - row.type = this.getControlType(props.type); - row.id = props.name; - row.prop = props.name; - row.defaultValue = props["default"]; - row.label = props.name; - row.items = props.possibleValues; - - section.Section.push([row]); - } - - PIData[piID] = []; - PIData[piID].push(section); - - // Setup the component hash object to store references to each component data - this.componentsData[componentData.component] = componentData; - - this.componentsLoaded++; - - if(this.componentsLoaded === this.componentsToLoad) { - // console.log("all loaded"); - // Here we need to stop some sort of loading animation - } - - } - }, - - // PI conversion method. This will convert the property type into a Ninja component - getControlType: { - value: function(type) { - switch(type) { - case "string": - return "textbox"; - case "boolean": - return "checkbox"; - case "select": - return "dropdown"; - case "number": - return "hottext"; - default: - alert("Conversion not implemented for ", type); - } - } - }, - - /********************************************************************* - * Handle Tree / Drag-Drop events - *********************************************************************/ - - handleDblclick: { - value: function(obj) { - this.addComponentToStage(this.componentsData[obj.component]); - } - }, - - handleDragStart: { - value: function(obj, event) { - this.dragComponent = obj; - event.dataTransfer.effectAllowed = 'move'; - event.dataTransfer.setData('text/plain', 'componentDrop'); - } - }, - - handleComponentDrop: { - value: function(left, top) { - this.addComponentToStage(this.componentsData[this.dragComponent.component], [left, top]); - } - }, - - - /** - * Send a request to add a component to the user document and waits for a callback to continue - */ - addComponentToStage: { - value: function(component, position) { - var that, element; - - // Check for position. If none then center on the stage - if(position) { - this.dragPosition = position; - } else { - this.dragPosition = this.getStageCenter(); - - } - that = this; - element = this.makeComponent(component.component); - - this.application.ninja.currentDocument._window.addComponent(element, {name: component.name, path: component.module}, function(instance, element) { - - //var pos = that.getStageCenter(); - - var styles = { - 'position': 'absolute', - 'left' : that.dragPosition[0] + 'px', - 'top' : that.dragPosition[1] + 'px', - '-webkit-transform-style' : 'preserve-3d', - '-webkit-transform' : 'perspective(1400) matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1)' - }; - - var defaultStyles = component.defaultStyles; - if(defaultStyles) { - for(var n in defaultStyles) { - styles[n] = defaultStyles[n]; - } - } - - instance.addEventListener('firstDraw', that, false); - - that.application.ninja.currentDocument.setComponentInstance(instance, element); - - NJevent("elementAdding", {"el": element, "data":styles}); - }); - - } - }, - - handleFirstDraw: { - value: function (e) { - NJevent("addComponentFirstDraw"); - } - }, - - makeComponent: { - value: function(name) { - var el; - - switch(name) { - case "anchor": - el = NJUtils.makeNJElement("a", "Anchor", "component"); - el.elementModel.pi = "AnchorPi"; - el.setAttribute("href", "http://www.motorola.com"); - el.innerHTML = "link"; - break; - case "button": - el = NJUtils.makeNJElement(name, "Button", "component"); - el.elementModel.pi = "ButtonPi"; - el.setAttribute("type", "button"); - el.innerHTML = "Button"; - break; - case "checkbox": - el = NJUtils.makeNJElement("input", "Checkbox", "component"); - el.elementModel.pi = "CheckboxPi"; - el.setAttribute("type", "checkbox"); - break; - case "imageComponent": - el = NJUtils.makeNJElement("image", "Image", "component"); - el.elementModel.pi = "ImagePi"; - el.setAttribute("width", 200); - el.setAttribute("height", 200); - break; - case "numberInput": - el = NJUtils.makeNJElement("input", "Number Input", "component"); - el.elementModel.pi = "NumberInputPi"; - el.setAttribute("type", "number"); - break; - case "select": - el = NJUtils.makeNJElement("select", "Select", "component"); - el.elementModel.pi = "SelectInputPi"; - break; - case "radioButton": - el = NJUtils.makeNJElement("input", "Radio Button", "component"); - el.elementModel.pi = "RadioButtonPi"; - el.setAttribute("type", "radio"); - break; - case "rangeInput": - el = NJUtils.makeNJElement("input", "Range Input", "component"); - el.elementModel.pi = "RangeInputPi"; - el.setAttribute("type", "range"); - break; - case "textfield": - case "searchfield": - el = NJUtils.makeNJElement("input", "Textfield", "component"); - el.elementModel.pi = "TextfieldPi"; - el.setAttribute("type", "text"); - break; - case "textarea": - el = NJUtils.makeNJElement("textarea", "TextArea", "component"); - el.elementModel.pi = "TextAreaPi"; - break; - case "toggleButton": - el = NJUtils.makeNJElement("button", "Toggle Button", "component"); - el.elementModel.pi = "ToggleButtonPi"; - el.innerHTML = "Off"; - break; - case "map": - el = NJUtils.makeNJElement("div", "Map", "component"); - el.elementModel.pi = "MapPi"; - el.elementModel.isComponent = true; - break; - case "feedreader": - el = NJUtils.makeNJElement("div", "Feed Reader", "component"); - el.elementModel.pi = "FeedReaderPi"; - el.elementModel.isComponent = true; - break; - case "picasa-carousel": - el = NJUtils.makeNJElement("div", "Picasa Carousel", "component"); - el.elementModel.pi = "PicasaCarouselPi"; - el.elementModel.isComponent = true; - break; - case "youtube-channel": - el = NJUtils.makeNJElement("div", "Youtube Channel", "component"); - el.elementModel.pi = "YoutubeChannelPi"; - el.elementModel.isComponent = true; - break; - - } - - return el; - } - }, - - /** - * - */ - getStageCenter: { - value: function() { - //if(!this.centerStage) { - var top, left; - - top = ~~((parseFloat(this.application.ninja.elementMediator.getProperty(this.application.ninja.currentDocument.documentRoot, "height"))) / 2); - left = ~~((parseFloat(this.application.ninja.elementMediator.getProperty(this.application.ninja.currentDocument.documentRoot, "width"))) / 2); - //this.centerStage = [top, left]; - return [left, top]; - //} - - //return this.centerStage; - } - } -}); \ No newline at end of file diff --git a/js/panels/components-panel.reel/components-panel.css b/js/panels/components-panel.reel/components-panel.css new file mode 100755 index 00000000..ac250c83 --- /dev/null +++ b/js/panels/components-panel.reel/components-panel.css @@ -0,0 +1,11 @@ +/* + This file contains proprietary software owned by Motorola Mobility, Inc.
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
+ (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. +
*/ + +.treeHolder{ + width: 227px; + background: red; + padding-left: 13px; +} diff --git a/js/panels/components-panel.reel/components-panel.html b/js/panels/components-panel.reel/components-panel.html new file mode 100755 index 00000000..f598a1ee --- /dev/null +++ b/js/panels/components-panel.reel/components-panel.html @@ -0,0 +1,65 @@ + + + + + + + + + + + + +
+
+
+ + + \ No newline at end of file diff --git a/js/panels/components-panel.reel/components-panel.js b/js/panels/components-panel.reel/components-panel.js new file mode 100755 index 00000000..9252b7b8 --- /dev/null +++ b/js/panels/components-panel.reel/components-panel.js @@ -0,0 +1,423 @@ +/* +This file contains proprietary software owned by Motorola Mobility, Inc.
+No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
+(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. +
*/ + +var Montage = require("montage/core/core").Montage, + Component = require("montage/ui/component").Component, + NJUtils = require("js/lib/NJUtils").NJUtils; + +var treeControlModule = require("js/components/tree.reel"); +var PIData = require("js/data/pi/pi-data").PiData; + +String.prototype.capitalizeFirstChar = function() { + return this.charAt(0).toUpperCase() + this.slice(1); +}; + + +exports.ComponentsPanel = Montage.create(Component, { + + components: { + value: { + "text": "styles", + "children": [ + { + "text": "Widgets", + "children": [ + { + "text": "Feed Reader", + "dataFile" : "node_modules/components-data/feed-reader.json", + "component": "feedreader" + }, + { + "text": "Map", + "dataFile" : "node_modules/components-data/map.json", + "component": "map" + }, + { + "text": "Picasa Carousel", + "dataFile" : "node_modules/components-data/picasa-carousel.json", + "component": "picasa-carousel" + }, + { + "text": "Search Bar", + "dataFile" : "node_modules/components-data/searchfield.json", + "component": "searchfield" + }, + { + "text": "Youtube Channel", + "dataFile" : "node_modules/components-data/youtube-channel.json", + "component": "youtube-channel" + } + ] + }, + { + "text": "Montage Components", + "children": [ + { + "text": "Anchor", + "dataFile" : "node_modules/components-data/anchor.json", + "component": "anchor" + }, + { + "text": "Button", + "dataFile" : "node_modules/components-data/button.json", + "component": "button" + }, + { + "text": "Checkbox", + "dataFile" : "node_modules/components-data/checkbox.json", + "component": "checkbox" + }, + { + "text": "Image Component", + "dataFile" : "node_modules/components-data/image.json", + "component": "imageComponent" + }, + { + "text": "NumberInput", + "dataFile" : "node_modules/components-data/number-input.json", + "component": "numberInput" + }, + { + "text": "Select Input", + "dataFile" : "node_modules/components-data/select.json", + "component": "select" + }, + { + "text": "Radio Button", + "dataFile" : "node_modules/components-data/radio-button.json", + "component": "radioButton" + }, + { + "text": "Range Input", + "dataFile" : "node_modules/components-data/range-input.json", + "component": "rangeInput" + }, + { + "text": "TextArea", + "dataFile" : "node_modules/components-data/textarea.json", + "component": "textarea" + }, + { + "text": "Textfield", + "dataFile" : "node_modules/components-data/textfield.json", + "component": "textfield" + }, + { + "text": "Toogle Button", + "dataFile" : "node_modules/components-data/toggle-button.json", + "component": "toggleButton" + } + ] + } + ] + } + }, + + componentsData: { + value: {} + }, + + componentsToLoad: { + value: null + }, + + componentsLoaded: { + value: 0 + }, + + dragComponent: { + value: null + }, + + dragPosition: { + value: null + }, + + centerStage: { + value: null + }, + + + /********************************************************************* + * Components Tree and Model Creation + *********************************************************************/ + + didCreate: { + value: function() { + // Setup the drop delegate + this.application.ninja.dragDropMediator.dropDelegate = this; + // Loop through the component and load the JSON data for them + this._loadComponents(); + } + }, + + // Load all the data files for each component + // TODO: Implement the error case + _loadComponents: { + value: function() { + + for(var cat in this.components.children) { + + this.componentsToLoad += this.components.children[cat].children.length; + + for(var i = 0, component; component = this.components.children[cat].children[i]; i++) { + var req = new XMLHttpRequest(); + //req.identifier = "searchRequest"; + req.open("GET", component.dataFile); + req.addEventListener("load", this, false); + req.addEventListener("error", this, false); + req.send(); + } + + } + } + }, + + handleLoad: { + value: function(evt) { + var componentData, component, piID, piObj, section; + + componentData = JSON.parse(evt.target.responseText); + + component = componentData.name; + + // Build the PI data and create a new object for Ninja PI + piID = component + "Pi"; + piObj = []; + section = {}; + section.label = component + " Properties"; + section.Section = []; + + for(var j = 0, props; props = componentData.properties[j]; j++) { + var row = {}; + row.type = this.getControlType(props.type); + row.id = props.name; + row.prop = props.name; + row.defaultValue = props["default"]; + row.label = props.name; + row.items = props.possibleValues; + + section.Section.push([row]); + } + + PIData[piID] = []; + PIData[piID].push(section); + + // Setup the component hash object to store references to each component data + this.componentsData[componentData.component] = componentData; + + this.componentsLoaded++; + + if(this.componentsLoaded === this.componentsToLoad) { + // console.log("all loaded"); + // Here we need to stop some sort of loading animation + } + + } + }, + + // PI conversion method. This will convert the property type into a Ninja component + getControlType: { + value: function(type) { + switch(type) { + case "string": + return "textbox"; + case "boolean": + return "checkbox"; + case "select": + return "dropdown"; + case "number": + return "hottext"; + default: + alert("Conversion not implemented for ", type); + } + } + }, + + /********************************************************************* + * Handle Tree / Drag-Drop events + *********************************************************************/ + + handleDblclick: { + value: function(obj) { + this.addComponentToStage(this.componentsData[obj.component]); + } + }, + + handleDragStart: { + value: function(obj, event) { + this.dragComponent = obj; + event.dataTransfer.effectAllowed = 'move'; + event.dataTransfer.setData('text/plain', 'componentDrop'); + } + }, + + handleComponentDrop: { + value: function(left, top) { + this.addComponentToStage(this.componentsData[this.dragComponent.component], [left, top]); + } + }, + + + /** + * Send a request to add a component to the user document and waits for a callback to continue + */ + addComponentToStage: { + value: function(component, position) { + var that, element; + + // Check for position. If none then center on the stage + if(position) { + this.dragPosition = position; + } else { + this.dragPosition = this.getStageCenter(); + + } + that = this; + element = this.makeComponent(component.component); + + this.application.ninja.currentDocument._window.addComponent(element, {name: component.name, path: component.module}, function(instance, element) { + + //var pos = that.getStageCenter(); + + var styles = { + 'position': 'absolute', + 'left' : that.dragPosition[0] + 'px', + 'top' : that.dragPosition[1] + 'px', + '-webkit-transform-style' : 'preserve-3d', + '-webkit-transform' : 'perspective(1400) matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1)' + }; + + var defaultStyles = component.defaultStyles; + if(defaultStyles) { + for(var n in defaultStyles) { + styles[n] = defaultStyles[n]; + } + } + + instance.addEventListener('firstDraw', that, false); + + that.application.ninja.currentDocument.setComponentInstance(instance, element); + + NJevent("elementAdding", {"el": element, "data":styles}); + }); + + } + }, + + handleFirstDraw: { + value: function (e) { + NJevent("addComponentFirstDraw"); + } + }, + + makeComponent: { + value: function(name) { + var el; + + switch(name) { + case "anchor": + el = NJUtils.makeNJElement("a", "Anchor", "component"); + el.elementModel.pi = "AnchorPi"; + el.setAttribute("href", "http://www.motorola.com"); + el.innerHTML = "link"; + break; + case "button": + el = NJUtils.makeNJElement(name, "Button", "component"); + el.elementModel.pi = "ButtonPi"; + el.setAttribute("type", "button"); + el.innerHTML = "Button"; + break; + case "checkbox": + el = NJUtils.makeNJElement("input", "Checkbox", "component"); + el.elementModel.pi = "CheckboxPi"; + el.setAttribute("type", "checkbox"); + break; + case "imageComponent": + el = NJUtils.makeNJElement("image", "Image", "component"); + el.elementModel.pi = "ImagePi"; + el.setAttribute("width", 200); + el.setAttribute("height", 200); + break; + case "numberInput": + el = NJUtils.makeNJElement("input", "Number Input", "component"); + el.elementModel.pi = "NumberInputPi"; + el.setAttribute("type", "number"); + break; + case "select": + el = NJUtils.makeNJElement("select", "Select", "component"); + el.elementModel.pi = "SelectInputPi"; + break; + case "radioButton": + el = NJUtils.makeNJElement("input", "Radio Button", "component"); + el.elementModel.pi = "RadioButtonPi"; + el.setAttribute("type", "radio"); + break; + case "rangeInput": + el = NJUtils.makeNJElement("input", "Range Input", "component"); + el.elementModel.pi = "RangeInputPi"; + el.setAttribute("type", "range"); + break; + case "textfield": + case "searchfield": + el = NJUtils.makeNJElement("input", "Textfield", "component"); + el.elementModel.pi = "TextfieldPi"; + el.setAttribute("type", "text"); + break; + case "textarea": + el = NJUtils.makeNJElement("textarea", "TextArea", "component"); + el.elementModel.pi = "TextAreaPi"; + break; + case "toggleButton": + el = NJUtils.makeNJElement("button", "Toggle Button", "component"); + el.elementModel.pi = "ToggleButtonPi"; + el.innerHTML = "Off"; + break; + case "map": + el = NJUtils.makeNJElement("div", "Map", "component"); + el.elementModel.pi = "MapPi"; + el.elementModel.isComponent = true; + break; + case "feedreader": + el = NJUtils.makeNJElement("div", "Feed Reader", "component"); + el.elementModel.pi = "FeedReaderPi"; + el.elementModel.isComponent = true; + break; + case "picasa-carousel": + el = NJUtils.makeNJElement("div", "Picasa Carousel", "component"); + el.elementModel.pi = "PicasaCarouselPi"; + el.elementModel.isComponent = true; + break; + case "youtube-channel": + el = NJUtils.makeNJElement("div", "Youtube Channel", "component"); + el.elementModel.pi = "YoutubeChannelPi"; + el.elementModel.isComponent = true; + break; + + } + + return el; + } + }, + + /** + * + */ + getStageCenter: { + value: function() { + //if(!this.centerStage) { + var top, left; + + top = ~~((parseFloat(this.application.ninja.elementMediator.getProperty(this.application.ninja.currentDocument.documentRoot, "height"))) / 2); + left = ~~((parseFloat(this.application.ninja.elementMediator.getProperty(this.application.ninja.currentDocument.documentRoot, "width"))) / 2); + //this.centerStage = [top, left]; + return [left, top]; + //} + + //return this.centerStage; + } + } +}); \ No newline at end of file -- cgit v1.2.3 From db6c0d20eba328408b37b65e67215d1866100c18 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Tue, 27 Mar 2012 11:34:06 -0700 Subject: removed trace statement Signed-off-by: Valerio Virgillito --- js/controllers/document-controller.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js index d5556fa8..b6d9dc67 100755 --- a/js/controllers/document-controller.js +++ b/js/controllers/document-controller.js @@ -71,7 +71,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component, handleAddComponentFirstDraw: { value: function (e) { //TODO: Add logic to reparse the document for dynamically added styles - console.log(e); + //console.log(e); } }, -- cgit v1.2.3 From f09921e6085f4b16c6e69ac8bfd67eef644fc04e Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Wed, 28 Mar 2012 22:43:47 -0700 Subject: Removing properties from Montage components Simplified properties for the following components: - anchor - button - checkbox - image - number imput Signed-off-by: Valerio Virgillito --- node_modules/components-data/anchor.json | 25 +++--------------- node_modules/components-data/button.json | 35 -------------------------- node_modules/components-data/checkbox.json | 30 ---------------------- node_modules/components-data/image.json | 5 ---- node_modules/components-data/number-input.json | 5 ++++ 5 files changed, 8 insertions(+), 92 deletions(-) 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 @@ -17,30 +17,11 @@ "type": "string", "default": "" }, - { - "name": "hreflang", - "type": "string", - "default": "" - }, - { - "name": "media", - "type": "string", - "default": "" - }, - { - "name": "rel", - "type": "string", - "default": "" - }, { "name": "target", - "type": "string", - "default": "" - }, - { - "name": "type", - "type": "string", - "default": "" + "type": "select", + "default": "_self", + "possibleValues": ["_self", "_blank", "_parent", "_top"] } ] } \ 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 @@ -12,46 +12,11 @@ "type": "string", "default": "Button" }, - { - "name": "autofocus", - "type": "boolean", - "default": "false" - }, { "name": "enabled", "type": "boolean", "default": "true" }, - { - "name": "form", - "type": "string", - "default": "" - }, - { - "name": "formaction", - "type": "string", - "default": "" - }, - { - "name": "formenctype", - "type": "string", - "default": "" - }, - { - "name": "formmethod", - "type": "string", - "default": "" - }, - { - "name": "formnovalidate", - "type": "boolean", - "default": "" - }, - { - "name": "formtarget", - "type": "string", - "default": "" - }, { "name": "name", "type": "string", 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 @@ -7,11 +7,6 @@ "properties": [ - { - "name": "autofocus", - "type": "boolean", - "default": "false" - }, { "name": "disabled", "type": "boolean", @@ -21,31 +16,6 @@ "name": "checked", "type": "boolean", "default": "false" - }, - { - "name": "form", - "type": "string", - "default": "" - }, - { - "name": "name", - "type": "string", - "default": "" - }, - { - "name": "readonly", - "type": "boolean", - "default": null - }, - { - "name": "title", - "type": "string", - "default": "" - }, - { - "name": "value", - "type": "string", - "default": "on" } ] } \ No newline at end of file diff --git a/node_modules/components-data/image.json b/node_modules/components-data/image.json index d6080196..22548cf9 100644 --- a/node_modules/components-data/image.json +++ b/node_modules/components-data/image.json @@ -16,11 +16,6 @@ "name": "src", "type": "string", "default": "" - }, - { - "name": "title", - "type": "string", - "default": "" } ] diff --git a/node_modules/components-data/number-input.json b/node_modules/components-data/number-input.json index d446fc37..bcdfb2c8 100644 --- a/node_modules/components-data/number-input.json +++ b/node_modules/components-data/number-input.json @@ -7,6 +7,11 @@ "properties": [ + { + "name": "value", + "type": "number", + "default": null + }, { "name": "min", "type": "number", -- cgit v1.2.3 From dd3cf0df2b03d1b5e124d99118c667eab55877e7 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Fri, 30 Mar 2012 14:34:03 -0700 Subject: IKNINJA-1191 - Fixed the order of the components Components now appear in alphabetical order. Signed-off-by: Valerio Virgillito --- js/panels/components-panel.reel/components-panel.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/js/panels/components-panel.reel/components-panel.js b/js/panels/components-panel.reel/components-panel.js index 9252b7b8..461abe84 100755 --- a/js/panels/components-panel.reel/components-panel.js +++ b/js/panels/components-panel.reel/components-panel.js @@ -80,11 +80,6 @@ exports.ComponentsPanel = Montage.create(Component, { "dataFile" : "node_modules/components-data/number-input.json", "component": "numberInput" }, - { - "text": "Select Input", - "dataFile" : "node_modules/components-data/select.json", - "component": "select" - }, { "text": "Radio Button", "dataFile" : "node_modules/components-data/radio-button.json", @@ -95,6 +90,11 @@ exports.ComponentsPanel = Montage.create(Component, { "dataFile" : "node_modules/components-data/range-input.json", "component": "rangeInput" }, + { + "text": "Select Input", + "dataFile" : "node_modules/components-data/select.json", + "component": "select" + }, { "text": "TextArea", "dataFile" : "node_modules/components-data/textarea.json", -- cgit v1.2.3 From 879ac8b40ec1bfb30bde92185e39da75b99c8396 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Fri, 30 Mar 2012 15:15:26 -0700 Subject: completing the component simple pi Signed-off-by: Valerio Virgillito --- .../components-panel.reel/components-panel.js | 2 +- node_modules/components-data/number-input.json | 1 - node_modules/components-data/radio-button.json | 25 ----- node_modules/components-data/range-input.json | 6 +- node_modules/components-data/select.json | 11 -- node_modules/components-data/textarea.json | 21 +--- node_modules/components-data/textfield.json | 114 --------------------- node_modules/components-data/toggle-button.json | 19 ++-- 8 files changed, 18 insertions(+), 181 deletions(-) diff --git a/js/panels/components-panel.reel/components-panel.js b/js/panels/components-panel.reel/components-panel.js index 461abe84..6972b9b4 100755 --- a/js/panels/components-panel.reel/components-panel.js +++ b/js/panels/components-panel.reel/components-panel.js @@ -106,7 +106,7 @@ exports.ComponentsPanel = Montage.create(Component, { "component": "textfield" }, { - "text": "Toogle Button", + "text": "Toggle Button", "dataFile" : "node_modules/components-data/toggle-button.json", "component": "toggleButton" } diff --git a/node_modules/components-data/number-input.json b/node_modules/components-data/number-input.json index bcdfb2c8..5e53fe58 100644 --- a/node_modules/components-data/number-input.json +++ b/node_modules/components-data/number-input.json @@ -6,7 +6,6 @@ "name": "NumberInput", "properties": [ - { "name": "value", "type": "number", diff --git a/node_modules/components-data/radio-button.json b/node_modules/components-data/radio-button.json index 4763453a..df0893ad 100644 --- a/node_modules/components-data/radio-button.json +++ b/node_modules/components-data/radio-button.json @@ -6,11 +6,6 @@ "name": "RadioButton", "properties": [ - { - "name": "autofocus", - "type": "boolean", - "default": "false" - }, { "name": "disabled", "type": "boolean", @@ -21,30 +16,10 @@ "type": "boolean", "default": "false" }, - { - "name": "form", - "type": "string", - "default": "" - }, { "name": "name", "type": "string", "default": "" - }, - { - "name": "readonly", - "type": "boolean", - "default": null - }, - { - "name": "title", - "type": "string", - "default": "" - }, - { - "name": "value", - "type": "string", - "default": "on" } ] } \ No newline at end of file diff --git a/node_modules/components-data/range-input.json b/node_modules/components-data/range-input.json index 871f7889..1f3f5b20 100644 --- a/node_modules/components-data/range-input.json +++ b/node_modules/components-data/range-input.json @@ -6,7 +6,11 @@ "name": "RangeInput", "properties": [ - + { + "name": "value", + "type": "number", + "default": 0 + }, { "name": "min", "type": "number", diff --git a/node_modules/components-data/select.json b/node_modules/components-data/select.json index b823f8d6..33849fb6 100644 --- a/node_modules/components-data/select.json +++ b/node_modules/components-data/select.json @@ -6,16 +6,5 @@ "name": "SelectInput", "properties": [ - - { - "name": "label", - "type": "string", - "default": "Button" - }, - { - "name": "enabled", - "type": "boolean", - "default": "true" - } ] } \ No newline at end of file diff --git a/node_modules/components-data/textarea.json b/node_modules/components-data/textarea.json index 6e3d78c2..8e780954 100644 --- a/node_modules/components-data/textarea.json +++ b/node_modules/components-data/textarea.json @@ -7,26 +7,15 @@ "properties": [ - { - "name": "rows", - "type": "number", - "default": null - }, - { - "name": "cols", - "type": "number", - "default": null - }, - { - "name": "wrap", - "type": "string", - "default": "soft", - "possibleValues": ["hard", "soft"] - }, { "name": "textContent", "type": "string", "default": null + }, + { + "name": "disabled", + "type": "boolean", + "default": false } ] } \ No newline at end of file diff --git a/node_modules/components-data/textfield.json b/node_modules/components-data/textfield.json index 39c65eab..cb3f1c8f 100644 --- a/node_modules/components-data/textfield.json +++ b/node_modules/components-data/textfield.json @@ -6,120 +6,6 @@ "name": "Textfield", "properties": [ - { - "name": "valueBinding", - "type": "string", - "default": null - },{ - "name": "accept", - "type": "string", - "default": null - }, - { - "name": "autocomplete", - "type": "string", - "default": "" - }, - { - "name": "autofocus", - "type": "boolean", - "default": "" - }, - { - "name": "checked", - "type": "boolean", - "default": "" - }, - { - "name": "disabled", - "type": "boolean", - "default": "" - }, - { - "name": "formaction", - "type": "string", - "default": "" - }, - { - "name": "formenctype", - "type": "string", - "default": "" - }, - { - "name": "formmethod", - "type": "string", - "default": "" - }, - { - "name": "formnovalidate", - "type": "boolean", - "default": "" - }, - { - "name": "formtarget", - "type": "string", - "default": "" - }, - { - "name": "list", - "type": "string", - "default": "" - }, - { - "name": "maxlength", - "type": "number", - "default": "" - }, - { - "name": "multiple", - "type": "boolean", - "default": "" - }, - { - "name": "name", - "type": "string", - "default": "" - }, - { - "name": "pattern", - "type": "string", - "default": "" - }, - { - "name": "placeholder", - "type": "string", - "default": "" - }, - { - "name": "readonly", - "type": "boolean", - "default": "" - }, - { - "name": "required", - "type": "boolean", - "default": "" - }, - { - "name": "selectionDirection", - "type": "string", - "default": "" - }, - { - "name": "size", - "type": "number", - "default": "" - }, - { - "name": "src", - "type": "string", - "default": "" - }, - { - "name": "step", - "type": "number", - "default": "" - }, { "name": "value", "type": "string", diff --git a/node_modules/components-data/toggle-button.json b/node_modules/components-data/toggle-button.json index e85dd72a..9590b1b5 100644 --- a/node_modules/components-data/toggle-button.json +++ b/node_modules/components-data/toggle-button.json @@ -6,31 +6,26 @@ "name": "ToggleButton", "properties": [ - { "name": "pressed", "type": "boolean", "default": "false" }, { - "name": "unpressedLabel", - "type": "string", - "default": "" - }, - { - "name": "pressedLabel", + "name": "label", "type": "string", - "default": "" + "default": "Toggle" }, { - "name": "pressedClass", + "name": "unpressedLabel", "type": "string", - "default": "pressed" + "default": "ASASASAS" }, { - "name": "label", + "name": "pressedLabel", "type": "string", - "default": "" + "default": "On" } + ] } \ No newline at end of file -- cgit v1.2.3 From e6cfd371849b92fccd5e7ee74e428914a2dc23eb Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Fri, 30 Mar 2012 15:15:26 -0700 Subject: completing the component simple pi Signed-off-by: Valerio Virgillito --- .../components-panel.reel/components-panel.js | 2 +- node_modules/components-data/number-input.json | 1 - node_modules/components-data/radio-button.json | 25 ----- node_modules/components-data/range-input.json | 6 +- node_modules/components-data/select.json | 11 -- node_modules/components-data/textarea.json | 21 +--- node_modules/components-data/textfield.json | 114 --------------------- node_modules/components-data/toggle-button.json | 19 ++-- 8 files changed, 18 insertions(+), 181 deletions(-) diff --git a/js/panels/components-panel.reel/components-panel.js b/js/panels/components-panel.reel/components-panel.js index 461abe84..6972b9b4 100755 --- a/js/panels/components-panel.reel/components-panel.js +++ b/js/panels/components-panel.reel/components-panel.js @@ -106,7 +106,7 @@ exports.ComponentsPanel = Montage.create(Component, { "component": "textfield" }, { - "text": "Toogle Button", + "text": "Toggle Button", "dataFile" : "node_modules/components-data/toggle-button.json", "component": "toggleButton" } diff --git a/node_modules/components-data/number-input.json b/node_modules/components-data/number-input.json index bcdfb2c8..5e53fe58 100644 --- a/node_modules/components-data/number-input.json +++ b/node_modules/components-data/number-input.json @@ -6,7 +6,6 @@ "name": "NumberInput", "properties": [ - { "name": "value", "type": "number", diff --git a/node_modules/components-data/radio-button.json b/node_modules/components-data/radio-button.json index 4763453a..df0893ad 100644 --- a/node_modules/components-data/radio-button.json +++ b/node_modules/components-data/radio-button.json @@ -6,11 +6,6 @@ "name": "RadioButton", "properties": [ - { - "name": "autofocus", - "type": "boolean", - "default": "false" - }, { "name": "disabled", "type": "boolean", @@ -21,30 +16,10 @@ "type": "boolean", "default": "false" }, - { - "name": "form", - "type": "string", - "default": "" - }, { "name": "name", "type": "string", "default": "" - }, - { - "name": "readonly", - "type": "boolean", - "default": null - }, - { - "name": "title", - "type": "string", - "default": "" - }, - { - "name": "value", - "type": "string", - "default": "on" } ] } \ No newline at end of file diff --git a/node_modules/components-data/range-input.json b/node_modules/components-data/range-input.json index 871f7889..1f3f5b20 100644 --- a/node_modules/components-data/range-input.json +++ b/node_modules/components-data/range-input.json @@ -6,7 +6,11 @@ "name": "RangeInput", "properties": [ - + { + "name": "value", + "type": "number", + "default": 0 + }, { "name": "min", "type": "number", diff --git a/node_modules/components-data/select.json b/node_modules/components-data/select.json index b823f8d6..33849fb6 100644 --- a/node_modules/components-data/sele