Merge branch 'pentool' into brushtool

Conflicts:
	imports/codemirror/mode/scheme/scheme.js
	js/tools/BrushTool.js

7 files changed, 4 insertions, 4 deletions

diff --git a/js/panels/Color/colorpanelbase.reel/colorpanelbase.html b/js/panels/Color/colorpanelbase.reel/colorpanelbase.html
index d4330596..d4330596 100644..100755
--- a/js/panels/Color/colorpanelbase.reel/colorpanelbase.html
+++ b/js/panels/Color/colorpanelbase.reel/colorpanelbase.html
diff --git a/js/panels/Color/colorpanelbase.reel/colorpanelbase.js b/js/panels/Color/colorpanelbase.reel/colorpanelbase.js
index 9a27689a..ff738bbe 100644..100755
--- 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/colorpanelbase.reel/css/colorpanelbase.css b/js/panels/Color/colorpanelbase.reel/css/colorpanelbase.css
index e4a0aa12..e4a0aa12 100644..100755
--- a/js/panels/Color/colorpanelbase.reel/css/colorpanelbase.css
+++ b/js/panels/Color/colorpanelbase.reel/css/colorpanelbase.css
diff --git a/js/panels/Color/colorpanelbase.reel/img/icon_default.png b/js/panels/Color/colorpanelbase.reel/img/icon_default.png
index 8e64991f..8e64991f 100644..100755
--- a/js/panels/Color/colorpanelbase.reel/img/icon_default.png
+++ b/js/panels/Color/colorpanelbase.reel/img/icon_default.png
diff --git a/js/panels/Color/colorpanelbase.reel/img/icon_nocolor.png b/js/panels/Color/colorpanelbase.reel/img/icon_nocolor.png
index 17164935..17164935 100644..100755
--- a/js/panels/Color/colorpanelbase.reel/img/icon_nocolor.png
+++ b/js/panels/Color/colorpanelbase.reel/img/icon_nocolor.png
diff --git a/js/panels/Color/colorpanelbase.reel/img/icon_swap.png b/js/panels/Color/colorpanelbase.reel/img/icon_swap.png
index c2c1681d..c2c1681d 100644..100755
--- a/js/panels/Color/colorpanelbase.reel/img/icon_swap.png
+++ b/js/panels/Color/colorpanelbase.reel/img/icon_swap.png
diff --git a/js/panels/Color/colorpanelbase.reel/img/knob.png b/js/panels/Color/colorpanelbase.reel/img/knob.png
index ecfbfcec..ecfbfcec 100644..100755
--- a/js/panels/Color/colorpanelbase.reel/img/knob.png
+++ b/js/panels/Color/colorpanelbase.reel/img/knob.png