From 9d2c2a80483415d7560b00cda5519153db23e241 Mon Sep 17 00:00:00 2001 From: Jose Antonio Marquez Date: Sat, 11 Feb 2012 23:04:36 -0800 Subject: Bug Fixes IKNINJA-1101 IKNINJA-1079 IKNINJA-1144 --- js/components/colorwheel.reel/compass_app_log.txt | 3 -- js/components/popup.reel/compass_app_log.txt | 48 ---------------------- .../Color/colorpanelbase.reel/colorpanelbase.js | 8 ++-- .../colorpanelpopup.reel/css/colorpanelpopup.css | 4 +- .../colorpanelpopup.reel/css/colorpanelpopup.scss | 4 +- 5 files changed, 8 insertions(+), 59 deletions(-) delete mode 100644 js/components/colorwheel.reel/compass_app_log.txt delete mode 100644 js/components/popup.reel/compass_app_log.txt diff --git a/js/components/colorwheel.reel/compass_app_log.txt b/js/components/colorwheel.reel/compass_app_log.txt deleted file mode 100644 index 815feb02..00000000 --- a/js/components/colorwheel.reel/compass_app_log.txt +++ /dev/null @@ -1,3 +0,0 @@ -2011-11-23 01:07:12 create css/colorwheel.css -2011-11-23 01:07:25 overwrite css/colorwheel.css -2011-12-20 17:04:05 overwrite css/colorwheel.css diff --git a/js/components/popup.reel/compass_app_log.txt b/js/components/popup.reel/compass_app_log.txt deleted file mode 100644 index 8a3fb984..00000000 --- a/js/components/popup.reel/compass_app_log.txt +++ /dev/null @@ -1,48 +0,0 @@ -2011-06-28 18:13:06 create css/popup.css -2011-06-28 18:13:12 identical css/popup.css -2011-06-28 18:14:08 overwrite css/popup.css -2011-06-28 18:14:20 overwrite css/popup.css -2011-06-28 18:14:29 overwrite css/popup.css -2011-06-28 18:17:23 overwrite css/popup.css -2011-06-28 18:17:27 overwrite css/popup.css -2011-06-28 18:17:56 overwrite css/popup.css -2011-06-28 18:18:09 overwrite css/popup.css -2011-06-28 18:20:30 overwrite css/popup.css -2011-06-28 18:22:35 overwrite css/popup.css -2011-06-28 18:24:12 overwrite css/popup.css -2011-06-28 18:24:23 overwrite css/popup.css -2011-06-28 18:24:33 overwrite css/popup.css -2011-06-28 18:25:17 overwrite css/popup.css -2011-06-28 18:26:21 overwrite css/popup.css -2011-06-28 18:26:33 overwrite css/popup.css -2011-06-28 18:26:42 overwrite css/popup.css -2011-06-28 18:26:57 overwrite css/popup.css -2011-06-28 18:29:57 overwrite css/popup.css -2011-06-28 18:30:14 overwrite css/popup.css -2011-06-28 18:30:23 overwrite css/popup.css -2011-06-28 18:30:48 overwrite css/popup.css -2011-06-28 18:31:03 overwrite css/popup.css -2011-06-29 10:18:31 overwrite css/popup.css -2011-06-29 10:18:47 overwrite css/popup.css -2011-06-29 10:37:19 overwrite css/popup.css -2011-06-29 10:40:29 overwrite css/popup.css -2011-06-29 10:45:37 overwrite css/popup.css -2011-06-29 10:45:53 identical css/popup.css -2011-06-29 10:46:52 overwrite css/popup.css -2011-06-29 10:47:02 identical css/popup.css -2011-06-29 13:30:47 overwrite css/popup.css -2011-06-29 13:31:14 overwrite css/popup.css -2011-12-20 17:06:48 overwrite css/popup.css -2011-12-22 11:29:15 overwrite css/popup.css -2011-12-22 11:29:24 identical css/popup.css -2011-12-22 11:30:05 overwrite css/popup.css -2011-12-22 11:30:33 overwrite css/popup.css -2011-12-22 11:30:51 overwrite css/popup.css -2011-12-22 11:32:30 overwrite css/popup.css -2011-12-22 11:33:06 overwrite css/popup.css -2011-12-22 11:33:12 overwrite css/popup.css -2011-12-22 11:33:32 identical css/popup.css -2011-12-22 11:33:36 overwrite css/popup.css -2011-12-22 11:34:48 overwrite css/popup.css -2012-01-26 11:42:18 overwrite css/popup.css -2012-01-26 11:42:20 overwrite css/popup.css diff --git a/js/panels/Color/colorpanelbase.reel/colorpanelbase.js b/js/panels/Color/colorpanelbase.reel/colorpanelbase.js index 9a27689a..ff738bbe 100644 --- a/js/panels/Color/colorpanelbase.reel/colorpanelbase.js +++ b/js/panels/Color/colorpanelbase.reel/colorpanelbase.js @@ -1499,13 +1499,13 @@ exports.ColorPanelBase = Montage.create(Component, { // if (type._event.clientX && type._event.clientY) { // - if (type._event.clientX > (parseInt(document.width)/2)) { + //if (type._event.clientX > (parseInt(document.width)/2)) { //TODO: Fix offset hack this.application.ninja.colorController.colorPopupManager.showColorPopup((type._event.clientX - type._event.offsetX) +'px', (type._event.target.clientHeight/2+type._event.clientY - type._event.offsetY)+'px', 'right', 'top'); - } else { + //} else { // - this.application.ninja.colorController.colorPopupManager.showColorPopup((type._event.clientX - type._event.offsetX)+parseInt(type._event.target.offsetWidth)+'px', (type._event.target.offsetHeight/2+type._event.clientY - type._event.offsetY)+'px', 'left', 'top'); - } + // this.application.ninja.colorController.colorPopupManager.showColorPopup((type._event.clientX - type._event.offsetX)+parseInt(type._event.target.offsetWidth)+'px', (type._event.target.offsetHeight/2+type._event.clientY - type._event.offsetY)+'px', 'left', 'top'); + //} } } } else { diff --git a/js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.css b/js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.css index 6a418279..4db0abff 100644 --- a/js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.css +++ b/js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.css @@ -6,7 +6,7 @@ */ /* line 12, colorpanelpopup.scss */ .cpp_popup { - overflow: none; + overflow: hidden; font-size: 12px; text-shadow: 1px 1px 1px #000; font-family: 'Droid Sans', sans-serif; @@ -28,7 +28,7 @@ text-indent: -9999px; overflow: hidden; float: right; - padding: none; + padding: 0; cursor: pointer; border: 1px solid transparent; } diff --git a/js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.scss b/js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.scss index 20481fb6..1f63658a 100644 --- a/js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.scss +++ b/js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.scss @@ -10,7 +10,7 @@ $grey_light: #494949; .cpp_popup { - overflow: none; + overflow: hidden; font-size: 12px; text-shadow: 1px 1px 1px #000; font-family: 'Droid Sans', sans-serif; @@ -32,7 +32,7 @@ $grey_light: #494949; text-indent: -9999px; overflow: hidden; float: right; - padding: none; + padding: 0; cursor: pointer; border: 1px solid transparent; } -- cgit v1.2.3 From 1c1862702f0356259c2e24fdccc3a5e42b6f03da Mon Sep 17 00:00:00 2001 From: Jose Antonio Marquez Date: Fri, 9 Mar 2012 15:21:26 -0800 Subject: Temp Gradient Fix Temporary fix for getting gradient mode. --- js/components/gradientpicker.reel/gradientpicker.js | 2 +- js/controllers/color-controller.js | 4 +++- js/panels/Color/colorpanelpopup.reel/colorpanelpopup.js | 13 +++++++++---- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/js/components/gradientpicker.reel/gradientpicker.js b/js/components/gradientpicker.reel/gradientpicker.js index 0940be3c..da4e8c0f 100755 --- a/js/components/gradientpicker.reel/gradientpicker.js +++ b/js/components/gradientpicker.reel/gradientpicker.js @@ -397,7 +397,7 @@ exports.GradientPicker = Montage.create(Component, { actionEvent.initEvent(type, true, true); actionEvent.type = type; actionEvent.wasSetByCode = userInitiated; - actionEvent.gradient = {stops: this.value, mode: this.mode, css: css}; + actionEvent.gradient = {stops: this.value, mode: this.mode, gradientMode: this.mode, css: css}; this.dispatchEvent(actionEvent); } } diff --git a/js/controllers/color-controller.js b/js/controllers/color-controller.js index a6e41dd3..53573baf 100755 --- a/js/controllers/color-controller.js +++ b/js/controllers/color-controller.js @@ -259,6 +259,7 @@ exports.ColorController = Montage.create(Component, { //Radial gradient gradient.stops = []; gradient.mode = 'radial'; + gradient.gradientMode = 'radial'; gradient.css = css; // arr = css.split('%,'); @@ -284,6 +285,7 @@ exports.ColorController = Montage.create(Component, { //Linear gradient gradient.stops = []; gradient.mode = 'linear'; + gradient.gradientMode = 'linear'; gradient.css = css; // arr = css.split('from('); @@ -317,7 +319,7 @@ exports.ColorController = Montage.create(Component, { } } //Creating gradient object - color = {mode: 'gradient', value: {stops: gradient.stops, mode: gradient.mode, css: css}}; + color = {mode: 'gradient', value: {stops: gradient.stops, mode: gradient.mode, gradientMode: gradient.gradientMode, css: css}}; } else if (css){ //Simple solid color color = this.parseCssToColor(css); diff --git a/js/panels/Color/colorpanelpopup.reel/colorpanelpopup.js b/js/panels/Color/colorpanelpopup.reel/colorpanelpopup.js index 299e603d..3eae3ea3 100755 --- a/js/panels/Color/colorpanelpopup.reel/colorpanelpopup.js +++ b/js/panels/Color/colorpanelpopup.reel/colorpanelpopup.js @@ -379,11 +379,16 @@ exports.ColorPanelPopup = Montage.create(Component, { gradient.element = container; gradient.hack = this.hack; // TODO: Remove // - if (g && g.value && g.value.stops && g.value.mode) { - gradient._mode = g.value.mode; - gradient.value = g.value.stops; + if (g && g.value && g.value.stops) { + if (g.value.gradientMode) { + gradient._mode = g.value.gradientMode; + gradient.value = g.value.stops; + } else { + gradient._mode = 'linear'; + gradient.value = g.value.stops; + } } else { - gradient._mode = this.defaultGradient.mode; + gradient._mode = this.defaultGradient.gradientMode; gradient.value = this.defaultGradient.stops; } // -- cgit v1.2.3 From 69d90467865a1384725b2301901be2180c5a841f Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Fri, 9 Mar 2012 15:58:40 -0800 Subject: reverting old pi data Signed-off-by: Valerio Virgillito --- js/data/pi/pi-data.js | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js index c42d9082..ba03c347 100755 --- a/js/data/pi/pi-data.js +++ b/js/data/pi/pi-data.js @@ -331,10 +331,11 @@ exports.PiData = Montage.create( Montage, { id: "tlRadius", prop : "tlRadius", label: "TL", + valueMutator: parseFloat, value : 0, min : 0, max : 100, - unit : "%", + unit : "px", acceptableUnits: ["px", "pt", "%"] }, { @@ -342,10 +343,12 @@ exports.PiData = Montage.create( Montage, { id : "trRadius", prop : "trRadius", label : "TR", + valueMutator: parseFloat, min : 0, max : 100, - unit : "%", - acceptableUnits: ["px", "pt", "%"] + unit : "px", + acceptableUnits: ["px", "pt", "%"], + divider: true } ], [ @@ -354,9 +357,10 @@ exports.PiData = Montage.create( Montage, { id : "blRadius", prop : "blRadius", label : "BL", + valueMutator: parseFloat, min : 0, max : 100, - unit : "%", + unit : "px", acceptableUnits: ["px", "pt", "%"] }, { @@ -364,9 +368,10 @@ exports.PiData = Montage.create( Montage, { id : "brRadius", prop : "brRadius", label : "BR", + valueMutator: parseFloat, min : 0, max : 100, - unit : "%", + unit : "px", acceptableUnits: ["px", "pt", "%"] } ] @@ -390,6 +395,7 @@ exports.PiData = Montage.create( Montage, { { type: "dropdown", id: "strokeMaterial", + prop: "strokeMaterial", label: "Stroke", labelField: "_name", dataField: "_name", @@ -402,6 +408,7 @@ exports.PiData = Montage.create( Montage, { { type: "dropdown", id: "fillMaterial", + prop: "fillMaterial", label: "Fill", labelField: "_name", dataField: "_name", @@ -524,7 +531,8 @@ exports.PiData = Montage.create( Montage, { type: "hottext", id: "innerRadius", prop: "innerRadius", - label: "Inner Radius", + label: "Inner R", + valueMutator: parseFloat, value : 0, min : 0, max : 100, @@ -553,6 +561,7 @@ exports.PiData = Montage.create( Montage, { { type: "dropdown", id: "strokeMaterial", + prop: "strokeMaterial", label: "Stroke", labelField: "_name", dataField: "_name", @@ -565,6 +574,7 @@ exports.PiData = Montage.create( Montage, { { type: "dropdown", id: "fillMaterial", + prop: "fillMaterial", label: "Fill", labelField: "_name", dataField: "_name", -- cgit v1.2.3