From 209e0781e926212bbaaad9e8ca4b61a0c389b30f Mon Sep 17 00:00:00 2001 From: Nivesh Rajbhandari Date: Tue, 28 Feb 2012 17:19:42 -0800 Subject: We need to remove color buttons from the color model when updating the PI for selection change. Signed-off-by: Nivesh Rajbhandari --- js/panels/properties/sections/custom.reel/custom.js | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'js/panels/properties/sections/custom.reel') diff --git a/js/panels/properties/sections/custom.reel/custom.js b/js/panels/properties/sections/custom.reel/custom.js index a2b9b9fa..a537d323 100755 --- a/js/panels/properties/sections/custom.reel/custom.js +++ b/js/panels/properties/sections/custom.reel/custom.js @@ -59,6 +59,8 @@ exports.CustomSection = Montage.create(Component, { if(obj1.visible === false) tmpRow.colorVisible = obj1.visible; if(obj2.visible === false) tmpRow.color2Visible = obj2.visible; + // TODO - Hack for now to reference the color select object to unregister color chips + this.controls["colorSelect"] = tmpRow; } else { @@ -344,6 +346,9 @@ exports.CustomSection = Montage.create(Component, { this.controls[aField.id] = obj; + // TODO - Hack for now to reference the color select object to unregister color chips + this.controls["stageBackground"] = obj; + return obj; } } -- cgit v1.2.3 From 42d78d11764dca5df6c7d01f3221f398bee17152 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Thu, 1 Mar 2012 15:00:48 -0800 Subject: Squashed commit of the workspace-bugs - Panels fixes. Signed-off-by: Valerio Virgillito --- .../properties/sections/custom.reel/custom.html | 61 ---- .../properties/sections/custom.reel/custom.js | 356 --------------------- 2 files changed, 417 deletions(-) delete mode 100755 js/panels/properties/sections/custom.reel/custom.html delete mode 100755 js/panels/properties/sections/custom.reel/custom.js (limited to 'js/panels/properties/sections/custom.reel') diff --git a/js/panels/properties/sections/custom.reel/custom.html b/js/panels/properties/sections/custom.reel/custom.html deleted file mode 100755 index 6d4cf0cd..00000000 --- a/js/panels/properties/sections/custom.reel/custom.html +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - -

- - \ No newline at end of file diff --git a/js/panels/properties/sections/custom.reel/custom.js b/js/panels/properties/sections/custom.reel/custom.js deleted file mode 100755 index a537d323..00000000 --- a/js/panels/properties/sections/custom.reel/custom.js +++ /dev/null @@ -1,356 +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 Component = require("montage/ui/component").Component; -var ElementsMediator = require("js/mediators/element-mediator").ElementMediator; - -//Custom Rows -var SingleRow = require("js/panels/properties/sections/custom-rows/single-row.reel").SingleRow; -var DualRow = require("js/panels/properties/sections/custom-rows/dual-row.reel").DualRow; -var ColorSelect = require("js/panels/properties/sections/custom-rows/color-select.reel").ColorSelect; - -// Components Needed to make this work -var Hottext = require("js/components/hottextunit.reel").HotTextUnit; -var Dropdown = require("js/components/combobox.reel").Combobox; -var TextField = require("js/components/textfield.reel").TextField; -var FileInput = require("js/components/ui/file-input.reel").FileInput; -var Checkbox = require("js/components/checkbox.reel").Checkbox; -var ColorChip = require("js/components/ui/color-chip.reel").ColorChip; - -exports.CustomSection = Montage.create(Component, { - - repeat: { - value: null - }, - - _fields: { - - }, - - fields: { - get: function() { - return this._fields; - }, - set: function(val) { - this.controls = {}; - this.rows = []; - this._fields = val; - for(var i=0; i < this._fields.length; i++) { - var tmpRow, fields; - if(this._fields[i].length === 1) { - fields = this._fields[i][0]; - tmpRow = SingleRow.create(); - tmpRow.content = this.generateObject(fields); - if (fields.label) tmpRow.label = fields.label; - if (fields.divider) tmpRow.divider = fields.divider; - this.rows.push(tmpRow); - } else if(this._fields[i].length === 2) { - - var obj1 = this._fields[i][0]; - var obj2 = this._fields[i][1]; - - - if (obj1.type == "color" && obj2.type == "color") { - tmpRow = Montage.create(ColorSelect); - if(obj1.visible === false) tmpRow.colorVisible = obj1.visible; - if(obj2.visible === false) tmpRow.color2Visible = obj2.visible; - - // TODO - Hack for now to reference the color select object to unregister color chips - this.controls["colorSelect"] = tmpRow; - } - else - { - tmpRow = DualRow.create(); - if (obj1.label) tmpRow.label = obj1.label; - if (obj2.label) tmpRow.label2 = obj2.label; - tmpRow.content = this.generateObject(obj1); - tmpRow.content2 = this.generateObject(obj2); - } - - if (obj1.divider === true || obj2.divider === true) tmpRow.divider = true; - this.rows.push(tmpRow); - - } else if(this._fields[i].length === 3) { - - } - - } - } - - }, - - rows: { - value: [] - }, - - controls: { - value:{} - }, - - handleChanging: { - value:function(event) { - var obj = event.currentTarget; - this._dispatchPropEvent({"type": "changing", "id": obj.id, "prop": obj.prop, "value": obj.value, "control": obj}); - } - }, - - handleChange: { - value:function(event) { - if(event._event.wasSetByCode) return; - - var obj = event.currentTarget; - this._dispatchPropEvent({"type": "change", "id": obj.id, "prop": obj.prop, "value": obj.value, "control": obj}); - } - }, - - /** - * Color change handler. Hard coding the stage for now since only the stage PI uses this color chip - */ - handleColorChange: { - value: function(event) { - // Change the stage color for now - //console.log(this, event); - ElementsMediator.setProperty([this.application.ninja.currentDocument.documentRoot], this.id, [event._event.color.css], "Change", "pi", ''); - /* - var propEvent = document.createEvent("CustomEvent"); - propEvent.initEvent("propertyChange", true, true); - propEvent.type = "propertyChange"; - - propEvent.prop = "background";//event.prop; - propEvent.value = event._event.color.css; - - this.dispatchEvent(propEvent); - */ - } - }, - - _dispatchPropEvent: { - value: function(event) { -// console.log(event); - var propEvent = document.createEvent("CustomEvent"); - if(event.type === "changing") - { - propEvent.initEvent("propertyChanging", true, true); - propEvent.type = "propertyChanging"; - } - else - { - propEvent.initEvent("propertyChange", true, true); - propEvent.type = "propertyChange"; - } - - propEvent.id = event.id; - propEvent.prop = event.prop; - propEvent.text = event.text; - propEvent.value = event.value; - - event.control.units ? propEvent.units = event.control.units : propEvent.units = ""; - - this.dispatchEvent(propEvent); - } - }, - - generateObject: { - value: function(fields) { - switch(fields.type) { - case "hottext" : return this.createHottext(fields); - case "dropdown" : return this.createDropdown(fields); - case "textbox" : return this.createTextField(fields); - case "file" : return this.createFileInput(fields); - case "checkbox" : return this.createCheckbox(fields); - case "chip" : return this.createColorChip(fields); - } - } - }, - - //Breaking Up Switch Case Statement to functions to return a row - createHottext: { - value: function(aField) { - - // Generate Hottext - var obj = Hottext.create(); - - // Set Values for HottextRow - if (aField.id) obj.id = aField.id; - if (aField.value) obj.value = aField.value; - if (aField.acceptableUnits) obj.acceptableUnits = aField.acceptableUnits; - if (aField.unit) obj.units = aField.unit; - if (aField.min) obj._minValue = aField.min; - if (aField.max) obj._maxValue = aField.max; - if (aField.prop) obj.prop = aField.prop; - - //Initiate onChange Events - obj.addEventListener("change", this, false); - obj.addEventListener("changing", this, false); - - //Bind object value to controls list so it can be manipulated - Object.defineBinding(this.controls, aField.id, { - boundObject: obj, - boundObjectPropertyPath: "value" - }); - - return obj; - } - }, - - createDropdown: { - value: function(aField) { - - //Generate Dropdown - var obj = Dropdown.create(); - - // Set Values for Dropdown - if (aField.id) obj.id = aField.id; - if (aField.prop) obj.prop = aField.prop; - if (aField.value) obj.value = aField.value; - if (aField.labelField) obj.labelField = aField.labelField; - if (aField.labelFunction) obj.labelFunction = aField.labelFunction; - if (aField.dataField) obj.dataField = aField.dataField; - if (aField.dataFunction) obj.dataFunction = aField.dataFunction; - if (aField.items) { - if(aField.items.boundObject) { - obj.items = eval(aField.items.boundObject)[aField.items.boundProperty]; - } else { - obj.items = aField.items; - } - } - if (aField.enabled) { - if(aField.enabled.boundObject) { - // TODO - For now, always bind to this.controls[someProperty] - Object.defineBinding(obj, "enabled", { - boundObject: this.controls, - boundObjectPropertyPath: aField.enabled.boundProperty, - oneway: false - }); - } else { - obj.enabled = aField.enabled; - } - } - - obj.addEventListener("change", this, false); -// -// Object.defineBinding(obj, "value", { -// boundObject: this.controls, -// boundObjectPropertyPath: aField.id, -// oneway: false, -// boundValueMutator: function(value) { -// console.log("In the binding ", value); -// return value; -// } -// }); - - Object.defineBinding(this.controls, aField.id, { - boundObject: obj, - boundObjectPropertyPath: "value", - oneway: false - }); - - - obj.needsDraw = true; - - return obj; - } - }, - - createTextField: { - value: function(aField) { - - // Generate Textfield - var obj = TextField.create(); - - // Set Values for TextField - if (aField.id) obj.id = aField.id; - if (aField.value) obj.value = aField.value; - if (aField.prop) obj.prop = aField.prop; - - //Initiate onChange Events - obj.addEventListener("change", this, false); - - //Bind object value to controls list so it can be manipulated - Object.defineBinding(this.controls, aField.id, { - boundObject: obj, - boundObjectPropertyPath: "value" - }); - - return obj; - } - }, - - createFileInput: { - value: function(aField) { - - // Generate Textfield - var obj = TextField.create(); - - // Set Values for TextField - if (aField.id) obj.id = aField.id; - if (aField.value) obj.value = aField.value; - if (aField.prop) obj.prop = aField.prop; - - - //Initiate onChange Events - obj.addEventListener("change", this, false); - - //Bind object value to controls list so it can be manipulated - Object.defineBinding(this.controls, aField.id, { - boundObject: obj, - boundObjectPropertyPath: "value" - }); - - return obj; - } - }, - - createCheckbox: { - value: function(aField) { - - // Generate Textfield - var obj = Checkbox.create(); - - // Set Values for TextField - if (aField.id) obj.id = aField.id; - if (aField.checked) obj.checked = aField.checked; - if (aField.value) obj.label = aField.value; - if (aField.prop) obj.prop = aField.prop; - - //Initiate onChange Events - obj.addEventListener("change", this, false); - - //Bind object value to controls list so it can be manipulated - Object.defineBinding(this.controls, aField.id, { - boundObject: obj, - boundObjectPropertyPath: "checked" - }); - - return obj; - } - }, - - createColorChip: { - value: function(aField) { - var obj = ColorChip.create(); - - obj.chip = true; - obj.iconType = "fillIcon"; - obj.mode = "chip"; - obj.offset = 0; - - if (aField.id) obj.id = aField.id; - if (aField.prop) obj.prop = aField.prop; - - obj.changeDelegate = this.handleColorChange; - - this.controls[aField.id] = obj; - - // TODO - Hack for now to reference the color select object to unregister color chips - this.controls["stageBackground"] = obj; - - return obj; - } - } - -}); \ No newline at end of file -- cgit v1.2.3