From 7b85cc5cc68e323058d76ce094b583980de7db60 Mon Sep 17 00:00:00 2001 From: Amanpreet Singh Date: Sun, 3 Jul 2016 23:26:35 +0530 Subject: [PATCH 1/3] Demos: Fix backbone requirejs demos acc to new api Closes #8477 --- demos/backbone-requirejs/js/main.js | 6 ++++-- .../js/routers/mobileRouter.js | 17 +++++++++-------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/demos/backbone-requirejs/js/main.js b/demos/backbone-requirejs/js/main.js index 6ab54ba012a..95a57e768ae 100644 --- a/demos/backbone-requirejs/js/main.js +++ b/demos/backbone-requirejs/js/main.js @@ -48,8 +48,10 @@ require([ ) require( [ "jquerymobile" ], function () { + $( "body" ).one( "pagecontainerchange", function() { - // Instantiates a new Backbone.js Mobile Router - this.router = new Mobile(); + // Instantiates a new Backbone.js Mobile Router + this.router = new Mobile(); + } ); }); }); diff --git a/demos/backbone-requirejs/js/routers/mobileRouter.js b/demos/backbone-requirejs/js/routers/mobileRouter.js index b45d37e46e9..facbf170eb6 100644 --- a/demos/backbone-requirejs/js/routers/mobileRouter.js +++ b/demos/backbone-requirejs/js/routers/mobileRouter.js @@ -12,6 +12,7 @@ define([ // Extends Backbone.Router var CategoryRouter = Backbone.Router.extend( { + backToHome: false, // The Router constructor initialize: function() { @@ -27,9 +28,9 @@ define([ // Instantiates a new Vehicles Category View this.vehiclesView = new CategoryView( { el: "#vehicles", collection: new CategoriesCollection( [] , { type: "vehicles" } ) } ); + // Tells Backbone to start watching for hashchange events Backbone.history.start(); - }, // Backbone.js Routes @@ -47,11 +48,10 @@ define([ home: function() { // Programatically changes to the categories page - this.pagecontainer.change( "#categories", { + this.pagecontainer.change( "#categories", { reverse: false, - changeHash: false + changeUrl: false }); - }, // Category method that passes in the type that is appended to the url hash @@ -59,9 +59,10 @@ define([ // Stores the current Category View inside of the currentView variable var currentView = this[ type + "View" ]; + var that = this; // If there are no collections in the current Category View - if(!currentView.collection.length) { + if( !currentView.collection.length ) { // Show's the jQuery Mobile loading icon $.mobile.loading( "show" ); @@ -70,9 +71,9 @@ define([ currentView.collection.fetch().done( function() { // Programatically changes to the current categories page - this.pagecontainer.change( "#" + type, { + that.pagecontainer.change( "#" + type, { reverse: false, - changeHash: false + changeUrl: false }); } ); @@ -84,7 +85,7 @@ define([ // Programatically changes to the current categories page this.pagecontainer.change( "#" + type, { reverse: false, - changeHash: false + changeUrl: false }); } From 80dc5efea536a2e11140b66ac0ac72227363b245 Mon Sep 17 00:00:00 2001 From: Amanpreet Singh Date: Mon, 4 Jul 2016 00:16:32 +0530 Subject: [PATCH 2/3] Build: Remove backbone require demos from spider --- build/tasks/options/spider.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/build/tasks/options/spider.js b/build/tasks/options/spider.js index a8bb3e6eff9..f9362e0c475 100644 --- a/build/tasks/options/spider.js +++ b/build/tasks/options/spider.js @@ -4,7 +4,8 @@ module.exports = { url: "http://localhost:" + "<%= phpPort %>", ignore: "api\\.jquerymobile\\.com/accordion|notapage|intel|" + - "api\\.jquerymobile\\.com/[0-9]\\.[0-9]|packt|twitter\\.com/jquery" + "api\\.jquerymobile\\.com/[0-9]\\.[0-9]|packt|twitter\\.com/jquery|" + + "demos/backbone\-requirejs/backbone\-require\.html" } }, "dist": { @@ -12,7 +13,8 @@ module.exports = { url: "http://localhost:" + "<%= phpPort %>" + "/dist/", ignore: "api\\.jquerymobile\\.com/accordion|notapage|intel|" + - "api\\.jquerymobile\\.com/[0-9]\\.[0-9]|packt|twitter\\.com/jquery" + "api\\.jquerymobile\\.com/[0-9]\\.[0-9]|packt|twitter\\.com/jquery|" + + "demos/backbone\-requirejs/backbone\-require\.html" } } }; From 9d696896c4f241932f497b479028f09c2f062958 Mon Sep 17 00:00:00 2001 From: Amanpreet Singh Date: Mon, 4 Jul 2016 00:43:48 +0530 Subject: [PATCH 3/3] Demos: Use change option instead of change method on instance --- demos/backbone-requirejs/js/routers/mobileRouter.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/demos/backbone-requirejs/js/routers/mobileRouter.js b/demos/backbone-requirejs/js/routers/mobileRouter.js index facbf170eb6..968dee46a26 100644 --- a/demos/backbone-requirejs/js/routers/mobileRouter.js +++ b/demos/backbone-requirejs/js/routers/mobileRouter.js @@ -17,7 +17,7 @@ define([ // The Router constructor initialize: function() { - this.pagecontainer = $( ".ui-pagecontainer" ).pagecontainer( "instance" ); + this.pagecontainerHandle = $( ".ui-pagecontainer" ); // Instantiates a new Animal Category View this.animalsView = new CategoryView( { el: "#animals", collection: new CategoriesCollection( [] , { type: "animals" } ) } ); @@ -48,7 +48,7 @@ define([ home: function() { // Programatically changes to the categories page - this.pagecontainer.change( "#categories", { + this.pagecontainerHandle.pagecontainer( "change", "#categories", { reverse: false, changeUrl: false }); @@ -71,7 +71,7 @@ define([ currentView.collection.fetch().done( function() { // Programatically changes to the current categories page - that.pagecontainer.change( "#" + type, { + that.pagecontainerHandle.pagecontainer( "change", "#" + type, { reverse: false, changeUrl: false }); @@ -83,7 +83,7 @@ define([ else { // Programatically changes to the current categories page - this.pagecontainer.change( "#" + type, { + this.pagecontainerHandle.pagecontainer( "change", "#" + type, { reverse: false, changeUrl: false });