diff options
author | Rogan Creswick <creswick@gmail.com> | 2013-06-14 17:38:33 -0700 |
---|---|---|
committer | Rogan Creswick <creswick@gmail.com> | 2013-06-14 17:38:33 -0700 |
commit | 68e9ba60559fe08c923fa5eebb2f6b4d27b74d9e (patch) | |
tree | 5047224d1e6c2ddd61785460ab7983ab4e16ccf5 /src/js/fiveui | |
parent | 2c3b25addc2bc8b1cb91eb6e708119ea47379e68 (diff) |
fixed some traversal issues with fiveui.query and the uigoerfive rule
Diffstat (limited to 'src/js/fiveui')
-rw-r--r-- | src/js/fiveui/injected/compute.js | 2 | ||||
-rw-r--r-- | src/js/fiveui/injected/injected.css | 6 | ||||
-rw-r--r-- | src/js/fiveui/injected/prelude.js | 4 | ||||
-rw-r--r-- | src/js/fiveui/injected/ui.js | 4 |
4 files changed, 6 insertions, 10 deletions
diff --git a/src/js/fiveui/injected/compute.js b/src/js/fiveui/injected/compute.js index a796558..49c0a43 100644 --- a/src/js/fiveui/injected/compute.js +++ b/src/js/fiveui/injected/compute.js @@ -268,7 +268,7 @@ * @param {DOMNode} elt */ var underFiveUI = function(elt) { - var ancestor = $(elt).parentsUntil('#uic-top', 'body'); + var ancestor = $(elt).parentsUntil('#fiveui-top', 'body'); return ancestor.length == 0; }; diff --git a/src/js/fiveui/injected/injected.css b/src/js/fiveui/injected/injected.css index 2f50058..9ef51db 100644 --- a/src/js/fiveui/injected/injected.css +++ b/src/js/fiveui/injected/injected.css @@ -26,15 +26,11 @@ } /* Reduce the JQuery UI spacing on the left of the dialog content. */ -#uic-dialog { +#fiveui-top { padding-left: 3px; font-family: Courier; } -#uic-top { - font-family: Courier; -} - .ui-dialog .ui-dialog-content { /* overflow: hidden !important; */ position: relative; diff --git a/src/js/fiveui/injected/prelude.js b/src/js/fiveui/injected/prelude.js index c073c9f..ce242f6 100644 --- a/src/js/fiveui/injected/prelude.js +++ b/src/js/fiveui/injected/prelude.js @@ -81,8 +81,8 @@ fiveui.query = function (sel, context) { } ); - $filteredResults = $results.not('#uic-top *') - .not('#uic-top') + $filteredResults = $results.not('#fiveui-top') + .not('#fiveui-top *') .filter(':visible'); // update global stats diff --git a/src/js/fiveui/injected/ui.js b/src/js/fiveui/injected/ui.js index 4affeae..221a979 100644 --- a/src/js/fiveui/injected/ui.js +++ b/src/js/fiveui/injected/ui.js @@ -26,7 +26,7 @@ var core = {}; core.port = obtainPort(); - core.ui = $('<div></div>').attr('id', 'uic-dialog'); + core.ui = $('<div></div>'); core.lockDepth = 0; @@ -193,7 +193,7 @@ autoOpen: false, zIndex: 50000 }); - newDialog.parent().attr('id', 'uic-top'); + newDialog.parent().attr('id', 'fiveui-top'); $('#controls').append($('<div id="clearButton"></div>') .button({ label: 'clear' })); |