Skip to content
This repository has been archived by the owner on Oct 8, 2021. It is now read-only.

Commit

Permalink
Merge 8de5646 into 66efe74
Browse files Browse the repository at this point in the history
  • Loading branch information
scottgonzalez committed Jun 13, 2014
2 parents 66efe74 + 8de5646 commit 8261ef1
Show file tree
Hide file tree
Showing 10 changed files with 3 additions and 407 deletions.
6 changes: 0 additions & 6 deletions Gruntfile.js
Expand Up @@ -223,7 +223,6 @@ module.exports = function( grunt ) {
files: {
src: [
"js/**/*.js",
"!js/jquery.hashchange.js",
"!js/jquery.js",
"!js/jquery.ui.widget.js",
"!js/widgets/jquery.ui.tabs.js",
Expand Down Expand Up @@ -954,11 +953,6 @@ module.exports = function( grunt ) {
"jquery-ui/jquery.ui.tabs.js": "jquery-ui-tabs/ui/jquery.ui.tabs.js"
}
},
"jquery-plugins": {
files: {
"jquery/plugins/jquery.hashchange.js": "jquery-hashchange/jquery.ba-hashchange.js"
}
}
},

clean: {
Expand Down
3 changes: 1 addition & 2 deletions bower.json
Expand Up @@ -16,8 +16,7 @@
"dependencies": {
"jquery": "1.11.1",
"jquery-ui": "jquery/jquery-ui#c0ab71056b936627e8a7821f03c044aec6280a40",
"jquery-ui-tabs": "jquery/jquery-ui#fadf2b312a05040436451c64bbfaf4814bc62c56",
"jquery-hashchange": "gseguin/jquery-hashchange#2da0c56fd418fa323c136254f971b6176f1ae135"
"jquery-ui-tabs": "jquery/jquery-ui#fadf2b312a05040436451c64bbfaf4814bc62c56"
},
"devDependencies": {
"requirejs": "2.1.2",
Expand Down
390 changes: 0 additions & 390 deletions external/jquery/plugins/jquery.hashchange.js

This file was deleted.

1 change: 0 additions & 1 deletion js/events/navigate.js
Expand Up @@ -6,7 +6,6 @@
// TODO break out pushstate support test so we don't depend on the whole thing
define([
"jquery",
"jquery-plugins/jquery.hashchange",
"./../ns",
"./../support" ], function( jQuery ) {
//>>excludeEnd("jqmBuildExclude");
Expand Down
1 change: 0 additions & 1 deletion js/index.php
Expand Up @@ -17,7 +17,6 @@
'events/touch.js',
'events/throttledresize.js',
'events/orientationchange.js',
'../external/jquery/plugins/jquery.hashchange.js',
'../external/jquery-ui/jquery.ui.core.js',
'defaults.js',
'helpers.js',
Expand Down
3 changes: 1 addition & 2 deletions js/init.js
Expand Up @@ -15,8 +15,7 @@ define([
"./navigation/method",
"./navigation",
"./widgets/loader",
"./vmouse",
"jquery-plugins/jquery.hashchange" ], function( jQuery ) {
"./vmouse" ], function( jQuery ) {
//>>excludeEnd("jqmBuildExclude");
(function( $, window, undefined ) {
var $html = $( "html" ),
Expand Down
1 change: 0 additions & 1 deletion js/navigation.js
Expand Up @@ -12,7 +12,6 @@ define( [
"./navigation/method",
"./events",
"./support",
"jquery-plugins/jquery.hashchange",
"./animationComplete",
"./widgets/pagecontainer",
"./widgets/page",
Expand Down
1 change: 0 additions & 1 deletion js/requirejs.config.js
Expand Up @@ -9,7 +9,6 @@ requirejs.config({
"jquery-plugins": "../external/jquery/plugins"
},
"shim": {
"jquery-plugins/jquery.hashchange": [ "jquery" ],
"jquery-ui/jquery.ui.widget": [ "jquery" ],
"jquery-ui/jquery.ui.tabs": [ "jquery-ui/jquery.ui.widget" ],
"jquery-ui/jquery.ui.core": [ "jquery" ]
Expand Down
1 change: 0 additions & 1 deletion js/widgets/pagecontainer.js
Expand Up @@ -13,7 +13,6 @@ define( [
"../navigation/method",
"../events",
"../support",
"jquery-plugins/jquery.hashchange",
"../widgets/page",
"../transitions/handlers" ], function( jQuery ) {
//>>excludeEnd("jqmBuildExclude");
Expand Down
3 changes: 1 addition & 2 deletions js/widgets/popup.js
Expand Up @@ -22,8 +22,7 @@ define( [
"../navigation/navigator",
"../navigation/method",
"../animationComplete",
"../navigation",
"jquery-plugins/jquery.hashchange" ], function( jQuery ) {
"../navigation" ], function( jQuery ) {
//>>excludeEnd("jqmBuildExclude");
(function( $, undefined ) {

Expand Down

0 comments on commit 8261ef1

Please sign in to comment.