Merge branch 'pentool' into brushtool

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

2 files changed, 3 insertions, 2 deletions

diff --git a/js/components/popup-manager.reel/popup-manager.html b/js/components/popup-manager.reel/popup-manager.html
index 7fbbc86e..7fbbc86e 100644..100755
--- a/js/components/popup-manager.reel/popup-manager.html
+++ b/js/components/popup-manager.reel/popup-manager.html
diff --git a/js/components/popup-manager.reel/popup-manager.js b/js/components/popup-manager.reel/popup-manager.js
index be3c1e8d..fbcd5035 100644..100755
--- a/js/components/popup-manager.reel/popup-manager.js
+++ b/js/components/popup-manager.reel/popup-manager.js
@@ -32,7 +32,8 @@ exports.PopupMananger = Montage.create(Component, {
     addPopup: {
         enumerable: true,
         value: function (popup, depth, blackout) {
-                //
+                //Fix to ensure always highest
+                this.element.style.zIndex = this._getNextHighestZindex(document.body); // Highest z-index in body
                 //TODO: Add blackout background
                 //Checking for manual or setting auto to next highest depth
                 if (depth) {
@@ -116,7 +117,7 @@ exports.PopupMananger = Montage.create(Component, {
     _getNextHighestZindex: {
         numerable: false,
         value: function (parent) {
-                //Adapcted from: http://greengeckodesign.com/blog/2007/07/get-highest-z-index-in-javascript.html
+                //CSS specificity in javascript found at http://gbradley.com/2009/10/02/css-specificity-in-javascript used with permission from Graham Bradley
                         var high = 0, current = 0, children = [], i;
                         //
                         if (parent) {