use jQuery to get .animate
This commit is contained in:
parent
ae8ee195a1
commit
1e845092c4
1 changed files with 2 additions and 7 deletions
|
@ -90,7 +90,7 @@ Ox.load.UI = function(options, callback) {
|
||||||
MozUserSelect: 'none',
|
MozUserSelect: 'none',
|
||||||
WebkitUserSelect: 'none'
|
WebkitUserSelect: 'none'
|
||||||
},
|
},
|
||||||
loadingInterval
|
loadingInterval;
|
||||||
|
|
||||||
browserSupported ? showIcon() : showWarning();
|
browserSupported ? showIcon() : showWarning();
|
||||||
|
|
||||||
|
@ -205,7 +205,7 @@ Ox.load.UI = function(options, callback) {
|
||||||
|
|
||||||
return {
|
return {
|
||||||
hide: function() {
|
hide: function() {
|
||||||
$screen.animate({
|
$('.OxLoadingScreen').animate({
|
||||||
opacity: browserSupported ? 0 : 0.9
|
opacity: browserSupported ? 0 : 0.9
|
||||||
}, 1000, function() {
|
}, 1000, function() {
|
||||||
if (browserSupported) {
|
if (browserSupported) {
|
||||||
|
@ -271,11 +271,6 @@ Ox.load.UI = function(options, callback) {
|
||||||
function initUI() {
|
function initUI() {
|
||||||
|
|
||||||
Ox.documentReady(function() {
|
Ox.documentReady(function() {
|
||||||
// FIXME: use Ox.$foo everywhere!
|
|
||||||
Ox.$body = Ox.UI.$body = $('body');
|
|
||||||
Ox.$document = Ox.UI.$document = $(document);
|
|
||||||
Ox.$head = Ox.UI.$head = $('head');
|
|
||||||
Ox.$window = Ox.UI.$window = $(window);
|
|
||||||
// fixme: is this the right place to do this?
|
// fixme: is this the right place to do this?
|
||||||
$.browser.mozilla && Ox.$document.on('dragstart', function() {
|
$.browser.mozilla && Ox.$document.on('dragstart', function() {
|
||||||
return false;
|
return false;
|
||||||
|
|
Loading…
Reference in a new issue