Skip to content
This repository has been archived by the owner on Aug 5, 2020. It is now read-only.

Uses Adaptive.$ over Mobify.$ if it is defined #17

Closed
wants to merge 4 commits into from
Closed

Uses Adaptive.$ over Mobify.$ if it is defined #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fbc4543
Uses Adaptive.$ over Mobify.$ if it is defined
May 27, 2014
5c05dbd
Forgot to grunt build
May 28, 2014
bbd9fc2
Fix bellows opening only once on Samsung Galaxy S3 (v4.3)
Jun 23, 2014
bbfbc97
Merge branch 'refs/heads/galaxy-s3-android-4.3-fix' into bind-to-Adap…
Jun 23, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build/bellows.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 11 additions & 7 deletions src/bellows.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
var Mobify = window.Mobify = window.Mobify || {};
Mobify.$ = Mobify.$ || window.Zepto || window.jQuery;
var Adaptive = window.Adaptive || {};
if (Adaptive.$ === undefined) {
Mobify.$ = Mobify.$ || window.Zepto || window.jQuery;
}
Mobify.UI = Mobify.UI || {};

(function($, document) {
Expand All @@ -9,7 +12,7 @@ Mobify.UI = Mobify.UI || {};
'touch': 'ontouchend' in document
});

})(Mobify.$, document);
})(Adaptive.$ || Mobify.$, document);


/**
Expand Down Expand Up @@ -64,12 +67,13 @@ Mobify.UI.Utils = (function($) {
}

var el = document.createElement('fakeelement');
// Samsung Galaxy S3 (v.4.3) requires WebkitTransition as the first option or else it grabs transition property that doesn't really work
var transitions = {
'WebkitTransition':'webkitTransitionEnd',
'transition':'transitionEnd transitionend',
'OTransition':'oTransitionEnd',
'MSTransition':'msTransitionEnd',
'MozTransition':'transitionend',
'WebkitTransition':'webkitTransitionEnd'
'MozTransition':'transitionend'
};

var t;
Expand All @@ -87,7 +91,7 @@ Mobify.UI.Utils = (function($) {

return exports;

})(Mobify.$);
})(Adaptive.$ || Mobify.$);


/*
Expand Down Expand Up @@ -292,7 +296,7 @@ Mobify.UI.Bellows = (function($, Utils) {

return Bellows;

})(Mobify.$, Mobify.UI.Utils);
})(Adaptive.$ || Mobify.$, Mobify.UI.Utils);

(function($) {
$.fn.bellows = function(options) {
Expand All @@ -307,4 +311,4 @@ Mobify.UI.Bellows = (function($, Utils) {
this.bellows = bellows; // Provide the bellows object to callers
});
};
})(Mobify.$);
})(Adaptive.$ || Mobify.$);