aboutsummaryrefslogtreecommitdiff
path: root/js/components/popup-manager.reel
diff options
context:
space:
mode:
authorPushkar Joshi2012-02-24 12:08:49 -0800
committerPushkar Joshi2012-02-24 12:08:49 -0800
commit03ca7a5ed13c25faaa9100bb666e062fd15335e6 (patch)
treec51112223ceb9121cd595a60335eb2795215590f /js/components/popup-manager.reel
parentfcb12cc09eb3cd3b42bd215877ba18f449275b75 (diff)
parent053fc63a2950c7a5ee4ebf98033b64d474a3c46e (diff)
downloadninja-03ca7a5ed13c25faaa9100bb666e062fd15335e6.tar.gz
Merge branch 'pentool' into brushtool
Conflicts: imports/codemirror/mode/scheme/scheme.js js/tools/BrushTool.js
Diffstat (limited to 'js/components/popup-manager.reel')
-rwxr-xr-x[-rw-r--r--]js/components/popup-manager.reel/popup-manager.html0
-rwxr-xr-x[-rw-r--r--]js/components/popup-manager.reel/popup-manager.js5
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, {
32 addPopup: { 32 addPopup: {
33 enumerable: true, 33 enumerable: true,
34 value: function (popup, depth, blackout) { 34 value: function (popup, depth, blackout) {
35 // 35 //Fix to ensure always highest
36 this.element.style.zIndex = this._getNextHighestZindex(document.body); // Highest z-index in body
36 //TODO: Add blackout background 37 //TODO: Add blackout background
37 //Checking for manual or setting auto to next highest depth 38 //Checking for manual or setting auto to next highest depth
38 if (depth) { 39 if (depth) {
@@ -116,7 +117,7 @@ exports.PopupMananger = Montage.create(Component, {
116 _getNextHighestZindex: { 117 _getNextHighestZindex: {
117 numerable: false, 118 numerable: false,
118 value: function (parent) { 119 value: function (parent) {
119 //Adapcted from: http://greengeckodesign.com/blog/2007/07/get-highest-z-index-in-javascript.html 120 //CSS specificity in javascript found at http://gbradley.com/2009/10/02/css-specificity-in-javascript used with permission from Graham Bradley
120 var high = 0, current = 0, children = [], i; 121 var high = 0, current = 0, children = [], i;
121 // 122 //
122 if (parent) { 123 if (parent) {