Merge remote-tracking branch 'refs/remotes/origin/master' into transactionNotifications

# Conflicts:
#	js/views/pageNavVw.js

Author: jjeffryes

css/obBase.css

@@ -40,55 +40,34 @@ <h2 class="ion-android-close custCol-text clickable"></h2>
       </div>
     </div>
   </div>
-  <div class="modal modal-opaque hide js-loadingMessageModal">
-    <div class="modal-child modal-childMain">
-      <div class="btn-corner btn-cornerTR js-closeIndexModal">
-        <h2 class="ion-close-circled"></h2>
-      </div>
-      <h1 class="txt-center rowTop20"><i class="ion-android-sync spinner"></i> Loading...</h1>
-      <p class="txt-center js-indexLoadingMsg1"></p>
-      <p class="txt-center js-indexLoadingMsg2"></p>
-      <p class="txt-center js-indexLoadingMsg3"></p>
-      <h2 class="txt-center">
-        &nbsp;<span class="js-indexLoadingMsg4"></span>&nbsp;
-      </h2>
-      <div class="rowTop20 width100 positionWrapper pad50">
-        <div class="txtFieldWrapper">
-          <input type="text" class="txtField borderRadius3 placeholder-dark" placeholder="http://serverIPorURL/api/v1/"
-                 style="height: 32px; text-indent: 10px;" name="newServer" id="indexNewServer" />
-          <a class="btn btn-txt btn-insideInput js-newServerIndexApp">Set New Server</a>
-        </div>
-      </div>
-      <div class="rowTop20 width100 positionWrapper pad50">
-        <div class="txtFieldWrapper">
-          <a class="btn btn-txtOnly js-defaultServerIndexApp">Set to http://localhost:18469/api/v1/</a>
-          <a class="btn btn-txt btn-insideInput pull-right js-defaultServerIndexApp">Set to Default</a>
-        </div>
-      </div>
-      <div class="positionBottom row60 width100">
-        <a class="btn btn-txt hCentered js-closeIndexApp">Close Application</a>
-      </div>
-      </div>
-    </div>
-  </div>
   <div id="statusBar"></div>
   <div id="pageNav" class="bar navBar navBar-main custCol-secondary padding0"></div>
-  <!-- the loading modal must be on top of the page nav or the reload button is hidden -->
-  <div id="loadingModal" class="modal modal-opaque js-loadingModal top0">
+  <div id="loadingModal" class="modal modal-opaque modal-cover-fullscreen js-loadingModal hide">
     <div class="spinner-with-logo fullCentered">
       <i class="ion-android-sync spinner fontSize30 spinner-with-logo-icon"></i>
     </div>
-    <div class="rowTop20">
-      <a class="btn btn-txt btn-corner btn-cornerTR js-indexReload"><i class="ion-android-sync"></i> Reload</a>
+    <div id="loadingModalContent">
+      <p class="fontSize16 js-translate" data-translate="errorMessages.loadingViewError"></p>
+      <div id="loadingModalBtns">
+        <a class="btn btn-large marginRight10 custCol-secondary custCol-text js-indexReload"><i class="ion-android-sync"></i> <span class="js-translate" data-translate="Reload"></span></a>
+        <a class="btn btn-large custCol-secondary custCol-text" href="#home"><i class="ion-eye"></i> <span class="js-translate" data-translate="LoadIndex"></span></a>
+      </div>
+
     </div>
   </div>
 
   <!--TODO: modularize non-modular scripts -->
   <script src="js/utils/list.min.js"></script>
 
   <script>
-    var app = require('./js/main'),
-        remote = require('remote');
+    var app = require('./js/start');
+
+    window.translateIndex = function(){
+      $('.js-translate').each(function() {
+        $(this).text(polyglot.t($(this).data("translate")));
+      });
+    };
+    translateIndex();
     $('.js-closeIndexModal').on('click', function(){
       $(this).closest('.modal').addClass('hide');
     });

imgs/helpdesk-icon.png

@@ -1,7 +1,7 @@
 var ipcRenderer = require('ipc-renderer'),
-    Socket = require('./utils/Socket'),
+    __ = require('underscore'),
     $ = require('jquery'),
-    ServerConfigMd = require('./models/serverConfigMd'),
+    Socket = require('./utils/Socket'),
     _app;
 
 function App() {
@@ -15,55 +15,42 @@ function App() {
   this._notifUnread = 0;
   this._chatMessagesUnread = 0;
 
-  // TODO: what is wrong with the localStorage adapter??? shouldn't need
-  // to manually provide the data to the model. All that should be needed
-  // is an ID and then a subsequent fetch, but that doesn't return the data.
-  // Investigate!
-  this.serverConfig = new ServerConfigMd( JSON.parse(localStorage['_serverConfig-1'] || '{}') );
-
-  // serverConfigMd.fetch();
-  if (!localStorage['_serverConfig-1']) {
-    this.serverConfig.save();
-  }  
-
-  this.connectHeartbeatSocket();
+  // TODO: rather than attach the serverConfigs CL
+  // in main.js, pass in the instance here so the
+  // dependency is more explicit.
 }
 
 App.prototype.connectHeartbeatSocket = function() {
-  var self = this;
+  var activeServer = this.serverConfigs.getActive();
 
-  clearTimeout(this.heartbeatSocketTimesup);
+  if (!activeServer) {
+    throw new Error(`No active server set. Please set via the Server Configs collection.`);
+  }
 
   if (this._heartbeatSocket) {
-    this._heartbeatSocket.connect(this.serverConfig.getHeartbeatSocketUrl());
+    this._heartbeatSocket.connect(activeServer.getHeartbeatSocketUrl());
   } else {
-    this._heartbeatSocket = new Socket(this.serverConfig.getHeartbeatSocketUrl());
-
-    this._heartbeatSocket.on('close', function() {
-      clearTimeout(self._heartbeatSocketTimesup);
-    });
+    this._heartbeatSocket = new Socket(activeServer.getHeartbeatSocketUrl());
   }
-
-  // give up if it takes to long
-  this._heartbeatSocketTimesup = setTimeout(function() {
-    if (self._heartbeatSocket.getReadyState() !== 1) {
-      //self._heartbeatSocket._socket.close(); //turn off for now, until server issues are fixed
-      alert(polyglot.t('errorMessages.serverTimeout'));
-    }
-  }, 30000); //wait for 30 seconds, sometimes the server stalls
 };
 
 App.prototype.getHeartbeatSocket = function() {
   return this._heartbeatSocket;
 };
 
 App.prototype.login = function() {
+  var activeServer = this.serverConfigs.getActive();
+
+  if (!activeServer) {
+    throw new Error(`No active server set. Please set via the Server Configs collection.`);
+  }
+
   return $.ajax({
-    url: this.serverConfig.getServerBaseUrl() + '/login',
+    url: activeServer.getServerBaseUrl() + '/login',
     method: 'POST',
     data: {
-      username: this.serverConfig.get('username'),
-      password: this.serverConfig.get('password')
+      username: activeServer.get('username'),
+      password: activeServer.get('password')
     },
     timeout: 3000
   });  
@@ -136,6 +123,10 @@ App.prototype.setUnreadChatMessageCount = function(count) {
   }
 };
 
+App.prototype.intlNumFormat = function(numberToFormat, maxDigits){
+  return new Intl.NumberFormat(window.lang, {maximumFractionDigits: maxDigits}).format(numberToFormat);
+};
+
 App.getApp = function() {
   if (!_app) {
     throw new Error('The app instance was never instantiated and is therefore not available.');
@@ -144,7 +135,4 @@ App.getApp = function() {
   return _app;
 };
 
-
 module.exports = App;
-
-

index.html

@@ -4,12 +4,39 @@ var Backbone = require('backbone'),
 
 module.exports = Backbone.Collection.extend({
   url: function() {
-    return app.serverConfig.getServerBaseUrl() + '/get_chat_conversations';
+    return app.serverConfigs.getActive().getServerBaseUrl() + '/get_chat_conversations';
   },
 
   model: ChatConversationMd,
 
-  comparator: function(convo) {
-    return -convo.get('timestamp');
+  initialize: function() {
+      this.on('change:unread', function(model){
+          // Only re-sort collection if unread count was incremented
+          if (model.hasChanged('unread') && model.get('unread') > 0) {
+            this.sort();
+          }
+      });
+  },
+
+  comparator: function(a, b) {
+    // Sort by unread messages first
+    if (a.get('unread') > 0 && b.get('unread') == 0) {
+      return -1;
+    }
+    
+    if (a.get('unread') == 0 && b.get('unread') > 0) {
+      return 1;
+    }
+    
+    // then sort by timestamp
+    if (a.get('timestamp') > b.get('timestamp')) {
+      return -1;
+    }
+    
+    if (a.get('timestamp') < b.get('timestamp')) {
+      return 1;
+    }
+    
+    return 0;
   }
 });

js/App.js

@@ -4,7 +4,7 @@ var Backbone = require('backbone'),
 
 module.exports = Backbone.Collection.extend({
   url: function() {
-    return app.serverConfig.getServerBaseUrl() + '/get_chat_messages';
+    return app.serverConfigs.getActive().getServerBaseUrl() + '/get_chat_messages';
   },
 
   model: ChatMessageMd,

js/collections/chatConversationsCl.js

@@ -5,7 +5,7 @@ var Backbone = require('backbone'),
 
 module.exports = Backbone.Collection.extend({
   url: function() {
-    return app.serverConfig.getServerBaseUrl() + '/get_notifications';
+    return app.serverConfigs.getActive().getServerBaseUrl() + '/get_notifications';
   },
 
   model: NotificationMd,

js/collections/chatMessagesCl.js

@@ -5,7 +5,7 @@ var __ = require('underscore'),
 
 module.exports = Backbone.Collection.extend({
   url: function() {
-    return app.serverConfig.getServerBaseUrl() + '/get_ratings';
+    return app.serverConfigs.getActive().getServerBaseUrl() + '/get_ratings';
   },
 
   model: RatingMd,

js/collections/notificationsCl.js

@@ -0,0 +1,35 @@
+var Backbone = require('backbone'),
+    localStorageSync = require('../utils/backboneLocalStorage'),
+    ServerConfigMd = require('../models/serverConfigMd');
+
+module.exports = Backbone.Collection.extend({
+  sync: localStorageSync.sync,
+  localStorage: new localStorageSync('__serverConfig'),  
+  model: ServerConfigMd,
+
+  getActive: function() {
+    var config = this.get(localStorage.activeServer);
+
+    if (!config && this.length) {
+      config = this.at(this.length - 1);
+      this.setActive(config.id);
+    }
+
+    return config;  
+  },
+
+  setActive: function(id) {
+    var md;
+
+    if (!(md = this.get(id))) {
+      throw new Error(`Unable to set the active server config. It must be an id of one of the available
+          server configs stored in this collection.`)
+    }
+
+    if (this._active !== id) {
+      this._active = id;
+      localStorage.activeServer = id;
+      this.trigger('activeServerChange', md);
+    }
+  }
+});

js/collections/ratingCl.js

@@ -15,16 +15,17 @@ module.exports = {
   keyShortcuts: {
     undo:            'z',
     discover:        'd',
-    myPage:          'h',
+    myPage:          't',
     customizePage:   'e',
     create:          'n',
-    purchases:       't',
-    sales:           'y',
+    purchases:       'k',
+    sales:           'm',
     cases:           'j',
     settings:        'g',
     addressBar:      'l',
     save:            's',
-    restart:         'r'
+    refresh:         'r',
+    restart:         'f'
   },
 
   setTestnet: function(testNetBoolean){