From 3a754133dbc138390503341fd2e9beba3e43aa4b Mon Sep 17 00:00:00 2001 From: Jose Antonio Marquez Date: Fri, 27 Jan 2012 12:05:17 -0800 Subject: Merged old FileIO --- js/panels/Color/colorbutton-manager.js | 0 .../ColorPanelPopup.scssc | Bin .../ColorPanelPopup.scssc | Bin .../ColorPanelBase.scssc | Bin js/panels/Color/colorchippopup.reel/colorchippopup.html | 0 js/panels/Color/colorchippopup.reel/colorchippopup.js | 0 js/panels/Color/colorchippopup.reel/css/colorchippopup.css | 0 js/panels/Color/colorchippopup.reel/img/icon_bitmap.png | Bin js/panels/Color/colorchippopup.reel/img/icon_colorwheel.png | Bin js/panels/Color/colorchippopup.reel/img/icon_gradient.png | Bin js/panels/Color/colorchippopup.reel/img/icon_nofill.png | Bin js/panels/Color/colorchippopup.reel/img/knob.png | Bin js/panels/Color/colorpanel.js | 0 js/panels/Color/colorpanelbase.reel/colorpanelbase.html | 0 js/panels/Color/colorpanelbase.reel/colorpanelbase.js | 0 js/panels/Color/colorpanelbase.reel/css/colorpanelbase.css | 0 js/panels/Color/colorpanelbase.reel/img/icon_default.png | Bin js/panels/Color/colorpanelbase.reel/img/icon_nocolor.png | Bin js/panels/Color/colorpanelbase.reel/img/icon_swap.png | Bin js/panels/Color/colorpanelbase.reel/img/knob.png | Bin js/panels/Color/colorpanelpopup.reel/colorpanelpopup.html | 0 js/panels/Color/colorpanelpopup.reel/colorpanelpopup.js | 0 .../Color/colorpanelpopup.reel/css/colorpanelpopup.css | 0 .../Color/colorpanelpopup.reel/css/colorpanelpopup.scss | 0 js/panels/Color/colorpanelpopup.reel/img/icon_bitmap.png | Bin .../Color/colorpanelpopup.reel/img/icon_colorwheel.png | Bin js/panels/Color/colorpanelpopup.reel/img/icon_gradient.png | Bin js/panels/Color/colorpanelpopup.reel/img/icon_nofill.png | Bin js/panels/Color/colorpanelpopup.reel/img/knob.png | Bin js/panels/Color/colorpopup-manager.js | 0 js/panels/Color/colortoolbar.reel/colortoolbar.html | 0 js/panels/Color/colortoolbar.reel/colortoolbar.js | 0 js/panels/Color/colortoolbar.reel/css/colortoolbar.css | 0 33 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 js/panels/Color/colorbutton-manager.js mode change 100644 => 100755 js/panels/Color/colorchippopup.reel/.sass-cache/2fbca323ccf38cf180e7675ba0d8d3e07adeffea/ColorPanelPopup.scssc mode change 100644 => 100755 js/panels/Color/colorchippopup.reel/.sass-cache/6f8390f69a31f1a976968b9c18d0824d78460db2/ColorPanelPopup.scssc mode change 100644 => 100755 js/panels/Color/colorchippopup.reel/.sass-cache/de22270a8ac487505e8876f1cd16286e094a5127/ColorPanelBase.scssc mode change 100644 => 100755 js/panels/Color/colorchippopup.reel/colorchippopup.html mode change 100644 => 100755 js/panels/Color/colorchippopup.reel/colorchippopup.js mode change 100644 => 100755 js/panels/Color/colorchippopup.reel/css/colorchippopup.css mode change 100644 => 100755 js/panels/Color/colorchippopup.reel/img/icon_bitmap.png mode change 100644 => 100755 js/panels/Color/colorchippopup.reel/img/icon_colorwheel.png mode change 100644 => 100755 js/panels/Color/colorchippopup.reel/img/icon_gradient.png mode change 100644 => 100755 js/panels/Color/colorchippopup.reel/img/icon_nofill.png mode change 100644 => 100755 js/panels/Color/colorchippopup.reel/img/knob.png mode change 100644 => 100755 js/panels/Color/colorpanel.js mode change 100644 => 100755 js/panels/Color/colorpanelbase.reel/colorpanelbase.html mode change 100644 => 100755 js/panels/Color/colorpanelbase.reel/colorpanelbase.js mode change 100644 => 100755 js/panels/Color/colorpanelbase.reel/css/colorpanelbase.css mode change 100644 => 100755 js/panels/Color/colorpanelbase.reel/img/icon_default.png mode change 100644 => 100755 js/panels/Color/colorpanelbase.reel/img/icon_nocolor.png mode change 100644 => 100755 js/panels/Color/colorpanelbase.reel/img/icon_swap.png mode change 100644 => 100755 js/panels/Color/colorpanelbase.reel/img/knob.png mode change 100644 => 100755 js/panels/Color/colorpanelpopup.reel/colorpanelpopup.html mode change 100644 => 100755 js/panels/Color/colorpanelpopup.reel/colorpanelpopup.js mode change 100644 => 100755 js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.css mode change 100644 => 100755 js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.scss mode change 100644 => 100755 js/panels/Color/colorpanelpopup.reel/img/icon_bitmap.png mode change 100644 => 100755 js/panels/Color/colorpanelpopup.reel/img/icon_colorwheel.png mode change 100644 => 100755 js/panels/Color/colorpanelpopup.reel/img/icon_gradient.png mode change 100644 => 100755 js/panels/Color/colorpanelpopup.reel/img/icon_nofill.png mode change 100644 => 100755 js/panels/Color/colorpanelpopup.reel/img/knob.png mode change 100644 => 100755 js/panels/Color/colorpopup-manager.js mode change 100644 => 100755 js/panels/Color/colortoolbar.reel/colortoolbar.html mode change 100644 => 100755 js/panels/Color/colortoolbar.reel/colortoolbar.js mode change 100644 => 100755 js/panels/Color/colortoolbar.reel/css/colortoolbar.css (limited to 'js/panels/Color') diff --git a/js/panels/Color/colorbutton-manager.js b/js/panels/Color/colorbutton-manager.js old mode 100644 new mode 100755 diff --git a/js/panels/Color/colorchippopup.reel/.sass-cache/2fbca323ccf38cf180e7675ba0d8d3e07adeffea/ColorPanelPopup.scssc b/js/panels/Color/colorchippopup.reel/.sass-cache/2fbca323ccf38cf180e7675ba0d8d3e07adeffea/ColorPanelPopup.scssc old mode 100644 new mode 100755 diff --git a/js/panels/Color/colorchippopup.reel/.sass-cache/6f8390f69a31f1a976968b9c18d0824d78460db2/ColorPanelPopup.scssc b/js/panels/Color/colorchippopup.reel/.sass-cache/6f8390f69a31f1a976968b9c18d0824d78460db2/ColorPanelPopup.scssc old mode 100644 new mode 100755 diff --git a/js/panels/Color/colorchippopup.reel/.sass-cache/de22270a8ac487505e8876f1cd16286e094a5127/ColorPanelBase.scssc b/js/panels/Color/colorchippopup.reel/.sass-cache/de22270a8ac487505e8876f1cd16286e094a5127/ColorPanelBase.scssc old mode 100644 new mode 100755 diff --git a/js/panels/Color/colorchippopup.reel/colorchippopup.html b/js/panels/Color/colorchippopup.reel/colorchippopup.html old mode 100644 new mode 100755 diff --git a/js/panels/Color/colorchippopup.reel/colorchippopup.js b/js/panels/Color/colorchippopup.reel/colorchippopup.js old mode 100644 new mode 100755 diff --git a/js/panels/Color/colorchippopup.reel/css/colorchippopup.css b/js/panels/Color/colorchippopup.reel/css/colorchippopup.css old mode 100644 new mode 100755 diff --git a/js/panels/Color/colorchippopup.reel/img/icon_bitmap.png b/js/panels/Color/colorchippopup.reel/img/icon_bitmap.png old mode 100644 new mode 100755 diff --git a/js/panels/Color/colorchippopup.reel/img/icon_colorwheel.png b/js/panels/Color/colorchippopup.reel/img/icon_colorwheel.png old mode 100644 new mode 100755 diff --git a/js/panels/Color/colorchippopup.reel/img/icon_gradient.png b/js/panels/Color/colorchippopup.reel/img/icon_gradient.png old mode 100644 new mode 100755 diff --git a/js/panels/Color/colorchippopup.reel/img/icon_nofill.png b/js/panels/Color/colorchippopup.reel/img/icon_nofill.png old mode 100644 new mode 100755 diff --git a/js/panels/Color/colorchippopup.reel/img/knob.png b/js/panels/Color/colorchippopup.reel/img/knob.png old mode 100644 new mode 100755 diff --git a/js/panels/Color/colorpanel.js b/js/panels/Color/colorpanel.js old mode 100644 new mode 100755 diff --git a/js/panels/Color/colorpanelbase.reel/colorpanelbase.html b/js/panels/Color/colorpanelbase.reel/colorpanelbase.html old mode 100644 new mode 100755 diff --git a/js/panels/Color/colorpanelbase.reel/colorpanelbase.js b/js/panels/Color/colorpanelbase.reel/colorpanelbase.js old mode 100644 new mode 100755 diff --git a/js/panels/Color/colorpanelbase.reel/css/colorpanelbase.css b/js/panels/Color/colorpanelbase.reel/css/colorpanelbase.css old mode 100644 new mode 100755 diff --git a/js/panels/Color/colorpanelbase.reel/img/icon_default.png b/js/panels/Color/colorpanelbase.reel/img/icon_default.png old mode 100644 new mode 100755 diff --git a/js/panels/Color/colorpanelbase.reel/img/icon_nocolor.png b/js/panels/Color/colorpanelbase.reel/img/icon_nocolor.png old mode 100644 new mode 100755 diff --git a/js/panels/Color/colorpanelbase.reel/img/icon_swap.png b/js/panels/Color/colorpanelbase.reel/img/icon_swap.png old mode 100644 new mode 100755 diff --git a/js/panels/Color/colorpanelbase.reel/img/knob.png b/js/panels/Color/colorpanelbase.reel/img/knob.png old mode 100644 new mode 100755 diff --git a/js/panels/Color/colorpanelpopup.reel/colorpanelpopup.html b/js/panels/Color/colorpanelpopup.reel/colorpanelpopup.html old mode 100644 new mode 100755 diff --git a/js/panels/Color/colorpanelpopup.reel/colorpanelpopup.js b/js/panels/Color/colorpanelpopup.reel/colorpanelpopup.js old mode 100644 new mode 100755 diff --git a/js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.css b/js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.css old mode 100644 new mode 100755 diff --git a/js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.scss b/js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.scss old mode 100644 new mode 100755 diff --git a/js/panels/Color/colorpanelpopup.reel/img/icon_bitmap.png b/js/panels/Color/colorpanelpopup.reel/img/icon_bitmap.png old mode 100644 new mode 100755 diff --git a/js/panels/Color/colorpanelpopup.reel/img/icon_colorwheel.png b/js/panels/Color/colorpanelpopup.reel/img/icon_colorwheel.png old mode 100644 new mode 100755 diff --git a/js/panels/Color/colorpanelpopup.reel/img/icon_gradient.png b/js/panels/Color/colorpanelpopup.reel/img/icon_gradient.png old mode 100644 new mode 100755 diff --git a/js/panels/Color/colorpanelpopup.reel/img/icon_nofill.png b/js/panels/Color/colorpanelpopup.reel/img/icon_nofill.png old mode 100644 new mode 100755 diff --git a/js/panels/Color/colorpanelpopup.reel/img/knob.png b/js/panels/Color/colorpanelpopup.reel/img/knob.png old mode 100644 new mode 100755 diff --git a/js/panels/Color/colorpopup-manager.js b/js/panels/Color/colorpopup-manager.js old mode 100644 new mode 100755 diff --git a/js/panels/Color/colortoolbar.reel/colortoolbar.html b/js/panels/Color/colortoolbar.reel/colortoolbar.html old mode 100644 new mode 100755 diff --git a/js/panels/Color/colortoolbar.reel/colortoolbar.js b/js/panels/Color/colortoolbar.reel/colortoolbar.js old mode 100644 new mode 100755 diff --git a/js/panels/Color/colortoolbar.reel/css/colortoolbar.css b/js/panels/Color/colortoolbar.reel/css/colortoolbar.css old mode 100644 new mode 100755 -- cgit v1.2.3 From 7b0910720a6979bf41c216c5072d5c7a91e6d0b7 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/panels/Color/colorpanelbase.reel/colorpanelbase.js | 8 ++++---- js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.css | 4 ++-- js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.scss | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'js/panels/Color') 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