aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorScott González <scott.gonzalez@gmail.com>2012-10-10 11:45:48 -0400
committerScott González <scott.gonzalez@gmail.com>2012-10-10 11:45:48 -0400
commita3f1a34d3b997550a5a8cf4c630e6580cd37cde5 (patch)
treecd8ff7023ca59a52fa65d3b50e67da76147ee105 /tests
parentfa62f21e5ad09e5368efc3079859730e23a7123b (diff)
downloadjquery-ui-a3f1a34d3b997550a5a8cf4c630e6580cd37cde5.tar.gz
jquery-ui-a3f1a34d3b997550a5a8cf4c630e6580cd37cde5.zip
Remove use of $.browser; add $.ui.ie and $.ui.ie6 temporarily.
Diffstat (limited to 'tests')
-rw-r--r--tests/jquery.simulate.js2
-rw-r--r--tests/unit/datepicker/datepicker_core.js4
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/jquery.simulate.js b/tests/jquery.simulate.js
index e281e2fee..790c88c27 100644
--- a/tests/jquery.simulate.js
+++ b/tests/jquery.simulate.js
@@ -148,7 +148,7 @@ $.extend( $.simulate.prototype, {
}
// TODO: can we hook into core's logic?
- if ( $.browser.msie || $.browser.opera ) {
+ if ( $.ui.ie || (({}).toString.call( window.opera ) === "[object Opera]") ) {
// TODO: is charCode ever <0 ? Can we just use charCode || keyCode?
event.keyCode = (options.charCode > 0) ? options.charCode : options.keyCode;
event.charCode = undefined;
diff --git a/tests/unit/datepicker/datepicker_core.js b/tests/unit/datepicker/datepicker_core.js
index 17cefe157..e17b239e5 100644
--- a/tests/unit/datepicker/datepicker_core.js
+++ b/tests/unit/datepicker/datepicker_core.js
@@ -59,7 +59,7 @@ test('baseStructure', function() {
var header, title, table, thead, week, panel, inl, child,
inp = init('#inp').focus(),
dp = $('#ui-datepicker-div'),
- iframe = ($.browser.msie && parseInt($.browser.version, 10) < 7);
+ iframe = ($.ui.ie6);
ok(dp.is(':visible'), 'Structure - datepicker visible');
ok(!dp.is('.ui-datepicker-rtl'), 'Structure - not right-to-left');
ok(!dp.is('.ui-datepicker-multi'), 'Structure - not multi-month');
@@ -186,7 +186,7 @@ test('customStructure', function() {
inp = init('#inp', $.datepicker.regional.he);
inp.data('showButtonPanel.datepicker',true);
inp.focus();
- iframe = ($.browser.msie && parseInt($.browser.version, 10) < 7);
+ iframe = ($.ui.ie6);
ok(dp.is('.ui-datepicker-rtl'), 'Structure RTL - right-to-left');
header = dp.children(':first');
ok(header.is('div.ui-datepicker-header'), 'Structure RTL - header division');