aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-02-11 23:04:36 -0800
committerJose Antonio Marquez2012-02-11 23:04:36 -0800
commit9d2c2a80483415d7560b00cda5519153db23e241 (patch)
treef7a9e5d5392713237b0cbb35d74d87280a82137a /js
parentc6ed3331e88eb01a52ac533e5449df3af2fb5965 (diff)
downloadninja-9d2c2a80483415d7560b00cda5519153db23e241.tar.gz
Bug Fixes
IKNINJA-1101 IKNINJA-1079 IKNINJA-1144
Diffstat (limited to 'js')
-rw-r--r--js/components/colorwheel.reel/compass_app_log.txt3
-rw-r--r--js/components/popup.reel/compass_app_log.txt48
-rw-r--r--js/panels/Color/colorpanelbase.reel/colorpanelbase.js8
-rw-r--r--js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.css4
-rw-r--r--js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.scss4
5 files changed, 8 insertions, 59 deletions
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 @@
12011-11-23 01:07:12 create css/colorwheel.css
22011-11-23 01:07:25 overwrite css/colorwheel.css
32011-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 @@
12011-06-28 18:13:06 create css/popup.css
22011-06-28 18:13:12 identical css/popup.css
32011-06-28 18:14:08 overwrite css/popup.css
42011-06-28 18:14:20 overwrite css/popup.css
52011-06-28 18:14:29 overwrite css/popup.css
62011-06-28 18:17:23 overwrite css/popup.css
72011-06-28 18:17:27 overwrite css/popup.css
82011-06-28 18:17:56 overwrite css/popup.css
92011-06-28 18:18:09 overwrite css/popup.css
102011-06-28 18:20:30 overwrite css/popup.css
112011-06-28 18:22:35 overwrite css/popup.css
122011-06-28 18:24:12 overwrite css/popup.css
132011-06-28 18:24:23 overwrite css/popup.css
142011-06-28 18:24:33 overwrite css/popup.css
152011-06-28 18:25:17 overwrite css/popup.css
162011-06-28 18:26:21 overwrite css/popup.css
172011-06-28 18:26:33 overwrite css/popup.css
182011-06-28 18:26:42 overwrite css/popup.css
192011-06-28 18:26:57 overwrite css/popup.css
202011-06-28 18:29:57 overwrite css/popup.css
212011-06-28 18:30:14 overwrite css/popup.css
222011-06-28 18:30:23 overwrite css/popup.css
232011-06-28 18:30:48 overwrite css/popup.css
242011-06-28 18:31:03 overwrite css/popup.css
252011-06-29 10:18:31 overwrite css/popup.css
262011-06-29 10:18:47 overwrite css/popup.css
272011-06-29 10:37:19 overwrite css/popup.css
282011-06-29 10:40:29 overwrite css/popup.css
292011-06-29 10:45:37 overwrite css/popup.css
302011-06-29 10:45:53 identical css/popup.css
312011-06-29 10:46:52 overwrite css/popup.css
322011-06-29 10:47:02 identical css/popup.css
332011-06-29 13:30:47 overwrite css/popup.css
342011-06-29 13:31:14 overwrite css/popup.css
352011-12-20 17:06:48 overwrite css/popup.css
362011-12-22 11:29:15 overwrite css/popup.css
372011-12-22 11:29:24 identical css/popup.css
382011-12-22 11:30:05 overwrite css/popup.css
392011-12-22 11:30:33 overwrite css/popup.css
402011-12-22 11:30:51 overwrite css/popup.css
412011-12-22 11:32:30 overwrite css/popup.css
422011-12-22 11:33:06 overwrite css/popup.css
432011-12-22 11:33:12 overwrite css/popup.css
442011-12-22 11:33:32 identical css/popup.css
452011-12-22 11:33:36 overwrite css/popup.css
462011-12-22 11:34:48 overwrite css/popup.css
472012-01-26 11:42:18 overwrite css/popup.css
482012-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, {
1499 // 1499 //
1500 if (type._event.clientX && type._event.clientY) { 1500 if (type._event.clientX && type._event.clientY) {
1501 // 1501 //
1502 if (type._event.clientX > (parseInt(document.width)/2)) { 1502 //if (type._event.clientX > (parseInt(document.width)/2)) {
1503 //TODO: Fix offset hack 1503 //TODO: Fix offset hack
1504 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'); 1504 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');
1505 } else { 1505 //} else {
1506 // 1506 //
1507 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'); 1507 // 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');
1508 } 1508 //}
1509 } 1509 }
1510 } 1510 }
1511 } else { 1511 } 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 @@
6 </copyright> */ 6 </copyright> */
7/* line 12, colorpanelpopup.scss */ 7/* line 12, colorpanelpopup.scss */
8.cpp_popup { 8.cpp_popup {
9 overflow: none; 9 overflow: hidden;
10 font-size: 12px; 10 font-size: 12px;
11 text-shadow: 1px 1px 1px #000; 11 text-shadow: 1px 1px 1px #000;
12 font-family: 'Droid Sans', sans-serif; 12 font-family: 'Droid Sans', sans-serif;
@@ -28,7 +28,7 @@
28 text-indent: -9999px; 28 text-indent: -9999px;
29 overflow: hidden; 29 overflow: hidden;
30 float: right; 30 float: right;
31 padding: none; 31 padding: 0;
32 cursor: pointer; 32 cursor: pointer;
33 border: 1px solid transparent; 33 border: 1px solid transparent;
34} 34}
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;
10 10
11.cpp_popup 11.cpp_popup
12{ 12{
13 overflow: none; 13 overflow: hidden;
14 font-size: 12px; 14 font-size: 12px;
15 text-shadow: 1px 1px 1px #000; 15 text-shadow: 1px 1px 1px #000;
16 font-family: 'Droid Sans', sans-serif; 16 font-family: 'Droid Sans', sans-serif;
@@ -32,7 +32,7 @@ $grey_light: #494949;
32 text-indent: -9999px; 32 text-indent: -9999px;
33 overflow: hidden; 33 overflow: hidden;
34 float: right; 34 float: right;
35 padding: none; 35 padding: 0;
36 cursor: pointer; 36 cursor: pointer;
37 border: 1px solid transparent; 37 border: 1px solid transparent;
38} 38}