mirror of
https://github.com/Hopiu/jquery-mobile.git
synced 2026-03-16 22:10:25 +00:00
A bit of new-fangled AMD code accidentally made it into 1.0 stable.
This commit is contained in:
parent
8303055687
commit
93d89da06f
1 changed files with 0 additions and 6 deletions
|
|
@ -2,12 +2,6 @@
|
|||
* "events" plugin - Handles events
|
||||
*/
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
//>>excludeStart("jqmBuildExclude", pragmas.jqmBuildExclude);
|
||||
define( [ "jquery.mobile.core", "jquery.mobile.media", "jquery.mobile.support", "jquery.mobile.vmouse" ], function() {
|
||||
//>>excludeEnd("jqmBuildExclude");
|
||||
>>>>>>> 1a52240... Fix for issue #2933 - get_orientation() and hence getScreenHeight() doesn't work on some devices
|
||||
(function( $, window, undefined ) {
|
||||
|
||||
// add new event shortcuts
|
||||
|
|
|
|||
Loading…
Reference in a new issue