Fix "userPage" ID getting dropped from transactions and settings views, which caused the theme to not be applied to those pages.

Fix contract details and other elements that should have been hidden that were overlapping parts of the transactionModal instead.

Author: jjeffryes

js/router.js

@@ -196,7 +196,7 @@ module.exports = Backbone.Router.extend({
     this.viewCache[index] = {
       cachedAt: Date.now(),
       view: this.view
-    }
+    };
   },
 
   newView: function(View, options) {
@@ -249,7 +249,7 @@ module.exports = Backbone.Router.extend({
         this.view.$el.detach();
         this.trigger('cache-detached', { view: this.view });
       } else {
-        this.view.close ? this.view.close() : this.view.remove()          
+        this.view.close ? this.view.close() : this.view.remove();         
       }
     }
 
@@ -345,7 +345,7 @@ module.exports = Backbone.Router.extend({
   },
 
   index: function(){
-    if(localStorage.getItem("route")){
+    if (localStorage.getItem("route")){
       this.navigate('#' + localStorage.getItem("route"), {trigger: true});
     } else {
       this.navigate('#home', {trigger: true});
@@ -437,7 +437,7 @@ module.exports = Backbone.Router.extend({
         orderID: orderID,
         tabState: tabState //opens a tab in the order modal
       },
-      bodyID: 'transactionsPage'
+      bodyID: 'userPage'
     });
 
     app.appBar.setTitle(window.polyglot.t('Transactions'));
@@ -452,7 +452,8 @@ module.exports = Backbone.Router.extend({
         userProfile: this.userProfile,
         state: state,
         socketView: this.socketView
-      }
+      },
+      bodyID: 'userPage'
     });
 
     app.appBar.setTitle(window.polyglot.t('Settings'));

js/templates/transactionModal.html

@@ -6,7 +6,7 @@ <h2 class="ion-android-close clickable"></h2>
   <% if(ob.invalidData){ %>
   <div class="fullCentered"><h2><%= polyglot.t('errorMessages.serverError') %></h2></div>
   <% } else { %>
-  <div class="modal-hero js-transactionHero shadow-inner1-light"
+  <div class="modal-hero js-transactionHero shadow-inner1-light overflowHidden"
     <% if(ob.vendor_offer.listing.item.image_hashes){ %>
     style="background-image: url(<%= ob.serverUrl %>get_image?hash=<%= ob.vendor_offer.listing.item.image_hashes[0] %>&guid=<%=ob.vendor_offer.listing.id.guid %>), url(imgs/defaultBanner.png);"
     <% } else { %>

js/views/pageVw.js

@@ -12,8 +12,8 @@ PageVw = BaseVw.extend({
 // when it's deciding whether to create a new one or use a cached one.
 PageVw.getCacheIndex = function(fragment) {
   if (!fragment) {
-    throw new Error('The fragment is empty. If you want your view to support being ' +
-      'indexed by an empty fragment, please override this method in your view ' +
+    throw new Error('The fragment is empty. If you want your view to support being '+
+      'indexed by an empty fragment, please override this method in your view '+
       'and return a hard-coded string identifier if an empty fragment is passed in.');
   }