Cleanup, comments, etc.

pmuir · May 28, 2012 · 219f93c · 219f93c
1 parent 35bbd8d
commit 219f93c
Show file tree

Hide file tree

Showing 15 changed files with 60 additions and 68 deletions.
diff --git a/src/main/webapp/booking-monitor.html b/src/main/webapp/booking-monitor.html
@@ -27,7 +27,7 @@ <h3 class="booking-status-header">Booking status</h3>
 
     <footer>
         <div style="text-align: center;">
-            <img src="resources/gfx/logo.png" alt="Errai" />
+            <img src="resources/img/logo.png" alt="Errai" />
         </div>
     </footer>
 </body>

diff --git a/src/main/webapp/desktop-index.html b/src/main/webapp/desktop-index.html
@@ -28,10 +28,10 @@
                 <div class="container">
                     <a class="brand">JBoss Ticket Monster</a>
                     <ul class="nav">
-                        <li><a data-tm-role="top-menu-item" href="#events">Events</a></li>
-                        <li><a data-tm-role="top-menu-item" href="#venues">Venues</a></li>
-                        <li><a data-tm-role="top-menu-item" href="#bookings">Bookings</a></li>
-                        <li><a data-tm-role="top-menu-item" href="#about">About</a></li>
+                        <li><a href="#events">Events</a></li>
+                        <li><a href="#venues">Venues</a></li>
+                        <li><a href="#bookings">Bookings</a></li>
+                        <li><a href="#about">About</a></li>
                     </ul>
                 </div>
             </div>

diff --git a/src/main/webapp/resources/js/app/collections/events.js b/src/main/webapp/resources/js/app/collections/events.js
@@ -11,9 +11,9 @@ define([
      *  We will use it for CRUD operations on Bookings
      */
     var Events = Backbone.Collection.extend({
-        url:"rest/events",
+        url:"rest/events", // the URL for performing CRUD operations
         model: Event,
-        id:"id",
+        id:"id", // the 'id' property of the model is the identifier
         comparator:function (model) {
             return model.get('category').id;
         }

diff --git a/src/main/webapp/resources/js/app/models/event.js b/src/main/webapp/resources/js/app/models/event.js
@@ -1,17 +1,16 @@
 /**
  * Module for the Event model
  */
-define([
-    'backbone'
+define([ 
+    'backbone' // depends and imports Backbone
 ], function (Backbone) {
-
     /**
      * The Event model class definition
      * Used for CRUD operations against individual events
      */
     var Event = Backbone.Model.extend({
-        urlRoot:'rest/events'
+        urlRoot:'rest/events' // the URL for performing CRUD operations
     });
-
+    // export the Event class
     return Event;
 });
diff --git a/src/main/webapp/resources/js/app/router/desktop/router.js b/src/main/webapp/resources/js/app/router/desktop/router.js
@@ -38,8 +38,8 @@ define("router", [
             BookingDetailView) {
 
     /**
-     * The Router class contains all the routes within the application - i.e. URLs and the actions
-     * that will be taken as a result.
+     * The Router class contains all the routes within the application - 
+     * i.e. URLs and the actions that will be taken as a result.
      *
      * @type {Router}
      */
@@ -63,62 +63,68 @@ define("router", [
             var eventsView = new EventsView({model:events, el:$("#content")});
             events.bind("reset",
                 function () {
-                    eventsView.render()
-                }).fetch()
+                    eventsView.render();
+                }).fetch();
         },
         venues:function () {
             var venues = new Venues;
-            var venuesView = new VenuesView({model:venues, el:$("#content")})
+            var venuesView = new VenuesView({model:venues, el:$("#content")});
             venues.bind("reset",
                 function () {
-                    venuesView.render()
-                }).fetch()
+                    venuesView.render();
+                }).fetch();
         },
         about:function () {
-            new AboutView({el:$("#content")}).render()
+            new AboutView({el:$("#content")}).render();
         },
         bookTickets:function (showId, performanceId) {
-            var createBookingView = new CreateBookingView({model:{showId:showId, performanceId:performanceId, bookingRequest:{tickets:[]}}, el:$("#content")})
-            createBookingView.render()
+            var createBookingView = 
+            	new CreateBookingView({
+            		model:{ showId:showId, 
+            			    performanceId:performanceId, 
+            			    bookingRequest:{tickets:[]}}, 
+            			    el:$("#content")
+            			   });
+            createBookingView.render();
         },
         listBookings:function () {
             var bookings = new Bookings;
-            var bookingsView = new BookingsView({model:bookings, el:$("#content")})
-
+            var bookingsView = new BookingsView({ 
+            	model:bookings, 
+            	 el:$("#content")});
             bookings.bind("destroy",
                 function () {
                     bookings.fetch({success:function () {
-                        bookingsView.render()
-                    }})
+                        bookingsView.render();
+                    }});
                 });
-
             bookings.fetch({success:function () {
-                bookingsView.render()
+                bookingsView.render();
             }});
         },
         eventDetail:function (id) {
             var model = new Event({id:id});
             var eventDetailView = new EventDetailView({model:model, el:$("#content")});
             model.bind("change",
                 function () {
-                    eventDetailView.render()
-                }).fetch()
+                    eventDetailView.render();
+                }).fetch();
         },
         venueDetail:function (id) {
             var model = new Venue({id:id});
             var venueDetailView = new VenueDetailView({model:model, el:$("#content")});
             model.bind("change",
                 function () {
-                    venueDetailView.render()
-                }).fetch()
+                    venueDetailView.render();
+                }).fetch();
         },
         bookingDetail:function (id) {
             var bookingModel = new Booking({id:id});
-            var bookingDetailView = new BookingDetailView({model:bookingModel, el:$("#content")})
+            var bookingDetailView = new BookingDetailView({model:bookingModel, el:$("#content")});
             bookingModel.bind("change",
                 function () {
-                    bookingDetailView.render()
-                }).fetch()
+                    bookingDetailView.render();
+                }).fetch();
 
         }
     });

diff --git a/src/main/webapp/resources/js/app/router/mobile/router.js b/src/main/webapp/resources/js/app/router/mobile/router.js
@@ -71,13 +71,13 @@ define("router",[
         },
         defaultHandler:function (actions) {
             if ("" != actions) {
-                $.mobile.changePage("#" + actions, {transition:'slide', changeHash:false, allowSamePageTransition:true})
+                $.mobile.changePage("#" + actions, {transition:'slide', changeHash:false, allowSamePageTransition:true});
             }
         },
         home:function () {
             utilities.applyTemplate($("#container"), HomeViewTemplate);
             try {
-                $("#container").trigger('pagecreate')
+                $("#container").trigger('pagecreate');
             } catch (e) {
                 // workaround for a spurious error thrown when creating the page initially
             }
@@ -87,16 +87,16 @@ define("router",[
             var eventsView = new EventsView({model:events, el:$("#container")});
             events.bind("reset",
                 function () {
-                    eventsView.render()
+                    eventsView.render();
                 }).fetch();
         },
         venues:function () {
             var venues = new Venues;
-            var venuesView = new VenuesView({model:venues, el:$("#container")})
+            var venuesView = new VenuesView({model:venues, el:$("#container")});
             venues.bind("reset",
                 function () {
-                    venuesView.render()
-                }).fetch()
+                    venuesView.render();
+                }).fetch();
         },
         about:function () {
             new AboutView({el:$("#container")}).render();
@@ -107,21 +107,21 @@ define("router",[
         },
         listBookings:function () {
             var bookings = new Bookings();
-            var bookingsView = new BookingsView({model:bookings, el:$("#container")})
+            var bookingsView = new BookingsView({model:bookings, el:$("#container")});
             bookings.bind("reset",
                 function () {
-                    bookingsView.render()
+                    bookingsView.render();
                 }).bind("destroy",
                 function () {
-                    this.fetch()
+                    this.fetch();
                 }).fetch();
         },
         eventDetail:function (id) {
             var model = new Event({id:id});
             var eventDetailView = new EventDetailView({model:model, el:$("#container")});
             model.bind("change",
                 function () {
-                    eventDetailView.render()
+                    eventDetailView.render();
                     $.mobile.changePage($("#container"), {transition:'slide', changeHash:false});
                 }).fetch();
         },
@@ -130,13 +130,13 @@ define("router",[
             var venueDetailView = new VenueDetailView({model:model, el:$("#container")});
             model.bind("change",
                 function () {
-                    venueDetailView.render()
+                    venueDetailView.render();
                     $.mobile.changePage($("#container"), {transition:'slide', changeHash:false});
                 }).fetch();
         },
         bookingDetail:function (id) {
             var bookingModel = new Booking({id:id});
-            var bookingDetailView = new BookingDetailView({model:bookingModel, el:$("#content")})
+            var bookingDetailView = new BookingDetailView({model:bookingModel, el:$("#content")});
             bookingModel.bind("change",
                 function () {
                     bookingDetailView.render();

diff --git a/src/main/webapp/resources/js/app/views/desktop/events.js b/src/main/webapp/resources/js/app/views/desktop/events.js
@@ -1,8 +1,7 @@
 define([
     'backbone',
     'utilities',
-    'text!../../../../templates/desktop/events.html',
-    'backbone'
+    'text!../../../../templates/desktop/events.html'
 ], function (
     Backbone,
     utilities,

diff --git a/src/main/webapp/resources/js/app/views/desktop/venues.js b/src/main/webapp/resources/js/app/views/desktop/venues.js
@@ -1,12 +1,11 @@
 define([
     'backbone',
     'utilities',
-    'text!../../../../templates/desktop/venues.html',
-    'backbone'
+    'text!../../../../templates/desktop/venues.html'
 ], function (
     Backbone,
     utilities,
-    eventsTemplate) {
+    venuesTemplate) {
 
     var EventsView = Backbone.View.extend({
         events:{
@@ -17,7 +16,7 @@ define([
                 _.map(this.model.models, function(model){
                     return model.get('address').city
                 }));
-            utilities.applyTemplate($(this.el), eventsTemplate, {cities: cities, model:this.model});
+            utilities.applyTemplate($(this.el), venuesTemplate, {cities: cities, model:this.model});
             $(this.el).find('.item:first').addClass('active');
             $(".collapse").collapse();
             $("a[rel='popover']").popover({trigger:'hover'});

diff --git a/src/main/webapp/resources/js/app/views/mobile/create-booking.js b/src/main/webapp/resources/js/app/views/mobile/create-booking.js
@@ -103,8 +103,8 @@ define([
         events:{
             "click a[id='confirmBooking']":"checkout",
             "change select":"refreshPrices",
-            "change input[type='number']":"updateForm",
-            "change input[name='email']":"updateForm"
+            "blur input[type='number']":"updateForm",
+            "blur input[name='email']":"updateForm"
         },
         render:function () {
 

diff --git a/src/main/webapp/resources/js/main-desktop.js b/src/main/webapp/resources/js/main-desktop.js
@@ -31,8 +31,7 @@ require([
     'order!backbone',
     'text',
     'order!bootstrap',
-    'text!../templates/templates.html',
     'order!router'
 ], function(){
-    console.log('all loaded')
+    console.log('all loaded');
 });
diff --git a/src/main/webapp/resources/js/main-mobile.js b/src/main/webapp/resources/js/main-mobile.js
@@ -11,7 +11,6 @@ require.config({
         order: 'libs/order',
         utilities: 'app/utilities',
         router:'app/router/mobile/router'
-
     }
 });
 
@@ -32,6 +31,6 @@ define("backbone", [
 
 // Now we declare all the dependencies
 require(['router'],
-       function(router){
+       function(){
     console.log('all loaded')
 });
diff --git a/src/main/webapp/resources/templates/desktop/booking-confirmation.html b/src/main/webapp/resources/templates/desktop/booking-confirmation.html
@@ -4,22 +4,16 @@ <h2 class="page-header">Booking #<%=booking.id%> confirmed!</h2>
 <div class="row-fluid">
     <div class="span5 well">
         <h4 class="page-header">Checkout information</h4>
-
         <p><strong>Email: </strong><%= booking.contactEmail %></p>
-
         <p><strong>Event: </strong> <%= performance.event.name %></p>
-
         <p><strong>Venue: </strong><%= performance.venue.name %></p>
-
         <p><strong>Date: </strong><%= new Date(booking.performance.date).toPrettyString() %></p>
-
         <p><strong>Created on: </strong><%= new Date(booking.createdOn).toPrettyString() %></p>
     </div>
     <div class="span5 well">
         <h4 class="page-header">Ticket allocations</h4>
         <table class="table table-striped table-bordered" style="background-color: #fffffa;">
             <thead>
-
             <tr>
                 <th>Ticket #</th>
                 <th>Category</th>

diff --git a/src/main/webapp/resources/templates/desktop/create-booking.html b/src/main/webapp/resources/templates/desktop/create-booking.html
@@ -24,7 +24,6 @@ <h4 class="page-header">Select tickets</h4>
         </div>
         <div id="ticketCategoriesViewPlaceholder" class="row-fluid"></div>
     </div>
-
     <div id="request-summary" class="span5 offset1 well">
         <h4 class="page-header">Order summary</h4>
         <div id="ticketSummaryView" class="row-fluid"/>

diff --git a/src/main/webapp/resources/templates/desktop/ticket-categories.html b/src/main/webapp/resources/templates/desktop/ticket-categories.html
@@ -19,7 +19,6 @@
 <% }) %>
 <div class="control-group">
     <label class="control-label"/>
-
     <div class="controls">
         <input type="button" class="btn btn-primary" name="add" value="Add tickets"/>
     </div>

diff --git a/src/main/webapp/resources/templates/desktop/ticket-summary-view.html b/src/main/webapp/resources/templates/desktop/ticket-summary-view.html
@@ -1,5 +1,4 @@
 <div class="span12">
-
     <% if (tickets.length>0) { %>
     <table class="table table-bordered table-condensed row-fluid" style="background-color: #fffffa;">
         <thead>