JDF-155 - ensure the application modules are loaded in proper order

jboss-developer · Nov 26, 2012 · 6b63d75 · 6b63d75
1 parent 93dc9f9
commit 6b63d75
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 11 deletions.
diff --git a/demo/src/main/webapp/resources/js/app/collections/bookings.js b/demo/src/main/webapp/resources/js/app/collections/bookings.js
@@ -3,7 +3,8 @@
  */
 define([
     'app/models/booking',
-    'configuration'
+    'configuration',
+    'backbone'
 ], function (Booking, config) {
 
     // Here we define the Bookings collection

diff --git a/demo/src/main/webapp/resources/js/app/collections/events.js b/demo/src/main/webapp/resources/js/app/collections/events.js
@@ -4,7 +4,8 @@
 define([
     // BThe collection element type and configuration are dependencies
     'app/models/event',
-    'configuration'
+    'configuration',
+    'backbone'
 ], function (Event, config) {
     /**
      *  Here we define the Bookings collection

diff --git a/demo/src/main/webapp/resources/js/app/collections/venues.js b/demo/src/main/webapp/resources/js/app/collections/venues.js
@@ -4,7 +4,8 @@
 define([
     // Configuration and the collection element type are dependencies
     'app/models/venue',
-    'configuration'
+    'configuration',
+    'backbone'
 ], function (Venue, config) {
 
     return Backbone.Collection.extend({

diff --git a/demo/src/main/webapp/resources/js/app/models/booking.js b/demo/src/main/webapp/resources/js/app/models/booking.js
@@ -3,7 +3,8 @@
  */
 define([
     // Configuration is a dependency
-    'configuration'
+    'configuration',
+    'backbone'
 ], function (config) {
 
     /**

diff --git a/demo/src/main/webapp/resources/js/app/models/event.js b/demo/src/main/webapp/resources/js/app/models/event.js
@@ -2,7 +2,8 @@
  * Module for the Event model
  */
 define([ 
-    'configuration'
+    'configuration',
+    'backbone'
 ], function (config) {
     /**
      * The Event model class definition

diff --git a/demo/src/main/webapp/resources/js/app/models/venue.js b/demo/src/main/webapp/resources/js/app/models/venue.js
@@ -2,7 +2,8 @@
  * Module for the Venue model
  */
 define([
-    'configuration'
+    'configuration',
+    'backbone'
 ], function (config) {
 
     /**

diff --git a/demo/src/main/webapp/resources/js/app/views/mobile/about.js b/demo/src/main/webapp/resources/js/app/views/mobile/about.js
@@ -1,4 +1,4 @@
-define([], function () {
+define(['backbone'], function () {
 
     var AboutView = Backbone.View.extend({
         render:function () {

diff --git a/demo/src/main/webapp/resources/js/configurations/desktop.js b/demo/src/main/webapp/resources/js/configurations/desktop.js
@@ -35,8 +35,6 @@ define("initializer", ["jquery"],
 // Now we declare all the dependencies
 require([
     'order!initializer',
-    'order!underscore',
-    'order!backbone',
     'order!router'
 ], function(){
 });

diff --git a/demo/src/main/webapp/resources/js/configurations/mobile.js b/demo/src/main/webapp/resources/js/configurations/mobile.js
@@ -34,7 +34,8 @@ define("configuration", function() {
             baseUrl: ""
         }
     }
-})
+});
+
 define("initializer", [
     'jquery',
     'utilities',
@@ -60,5 +61,5 @@ require(['order!initializer',
 
 define(["configuration"],function(configuration){
     return {config: configuration };
-})
+});