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

Author: jjeffryes

js/languages/en-US.json

@@ -231,7 +231,9 @@
   "SearchForCategory": "Search for category",
   "Moderators": "Moderators",
   "CurrentModerators": "Current Moderators",
-  "AddModerators": "Add New Moderators",
+  "AddModerators": "Add Moderators",
+  "ManualAddModerator": "Add Moderators by GUID",
+  "ManualAddModeratorHelp": "Enter the GUIDs of one or more moderators, separated by commas, here. The GUID is on the right side of their About tab on their page. Adding the GUID of a user that is not a moderator will have no effect, that GUID will be ignored.",
   "DeselectToRemoveModerator": "Deselect the moderators you want to remove",
   "SelectToAddModerator": "Select the moderators you want to add",
   "Categories": "Categories",

js/models/timezonesMd.js

@@ -88,7 +88,7 @@ module.exports = Backbone.Model.extend({
             "offset": 5
         },
         {
-            "name":"(GMT +5:30) Bombay, Calcutta, Madras, New Delhi",
+            "name":"(GMT +5:30) Mumbai, Kolkata, Chennai, New Delhi",
             "offset": 5.5
         },
         {

js/templates/buyDetails.html

@@ -38,7 +38,7 @@
         </form>
       </div>
     </div>
-    <div class="flexCol-4">
+    <div class="flexCol-4 overflowHidden">
       <div class="rowItem padding2015 alignRight marginTop20">
         <span class="noOverflow fontSize13 js-buyWizardBTCPrice"></span>
         <span class="noOverflow textOpacity75 fontSize13 js-buyWizardPrice">

js/templates/settings.html

@@ -729,7 +729,7 @@ <h3 class="padding15 margin0 fontWeight500"><%= polyglot.t('Basic') %></h3>
               <div class="flexCol-9 borderRight0 custCol-border">
                 <div class="hideTopAndBottomBorder js-settingsCurrentMods">
                 </div>
-                <div class="padding10 width100 alignCenter fadeable js-loadingMsg">
+                <div class="padding10 width100 alignCenter fadeable js-loadingMsgOld">
                   <i class="ion-android-sync spinner textSize24px textOpacity50"></i>
                 </div>
               </div>
@@ -750,12 +750,32 @@ <h3 class="padding15 margin0 fontWeight500"><%= polyglot.t('Basic') %></h3>
               <div class="flexCol-9 borderRight0 custCol-border">
                 <div class="hideTopAndBottomBorder js-settingsNewMods">
                 </div>
-                <div class="padding10 width100 alignCenter fadeable js-loadingMsg">
+                <div class="padding10 width100 alignCenter fadeable js-loadingMsgNew">
                   <i class="ion-android-sync spinner textSize24px textOpacity50"></i>
                 </div>
               </div>
             </div>
 
+            <div class="flexRow">
+              <div class="flexCol-3  borderRight custCol-border zIndex1"><!-- add z-index so help box overlaps next column-->
+                <div class="fieldItem">
+                  <label for="addManualMods" class="tooltip tooltip-box" data-tooltip="<%= polyglot.t('ManualAddModeratorHelp') %>">
+                    <%= polyglot.t('ManualAddModerator') %> <i class="ion-help-circled"></i>
+                  </label>
+
+                </div>
+              </div>
+
+              <div class="flexCol-9 borderRight0 custCol-border">
+                <div class="fieldItem padding0">
+                  <input name="manualMods"
+                         type="text"
+                         id="addManualMods"
+                         class="fieldItem">
+                </div>
+              </div>
+            </div>
+
             <div class="flexRow TODO">
               <div class="flexCol-3  borderRight custCol-border">
                 <div class="fieldItem">
@@ -768,6 +788,7 @@ <h3 class="padding15 margin0 fontWeight500"><%= polyglot.t('Basic') %></h3>
               <div class="flexCol-9 borderRight0 custCol-border">
                 <div class="fieldItem padding0">
                   <!--TODO: keywords input here -->
+                  <input id="store-keywords">
                 </div>
               </div>
             </div>

js/templates/userPage.html

@@ -257,7 +257,7 @@ <h1 class="page-userNameLarge floatLeft fancy-heading fontSize20 colorWhiteForce
               </a>
             <%}%>
             <% if(ob.page.profile.about) { %>
-             <div class="js-userAbout margin0 flexContainer editableContent"><%= ob.page.profile.displayAbout %></div>
+             <div class="js-userAbout margin0 editableContent"><%= ob.page.profile.displayAbout %></div>
             <%}else{%>
               <span class="textOpacity75"><%= polyglot.t('AboutEmpty') %></span>
             <%}%>

js/views/buyDetailsVw.js

@@ -15,18 +15,34 @@ module.exports = Backbone.View.extend({
 
   initialize: function() {
     "use strict";
-    var currentShippingPrice = 0,
+    var recipient = this.model.get('page').profile.handle || this.model.get('page').profile.guid;
+
+    this.model.set('recipient', recipient);
+
+    this.listenTo(this.model, 'change:selectedModerator change:selectedAddress', this.render);
+    this.render();
+  },
+
+  render: function(){
+    var self = this,
+        currentShippingPrice = 0,
         currentShippingBTCPrice = 0,
-        recipient = this.model.get('page').profile.handle || this.model.get('page').profile.guid;
-    if(this.model.get('vendor_offer').listing.shipping.free !== true) {
-      if(this.model.get('userCountry') != this.model.get('vendor_offer').listing.shipping.shipping_origin) {
+        shippingType = "",
+        templJSON = {};
+    console.log(this.model)
+
+    //set prices before each render
+    if(this.model.get('vendor_offer').listing.shipping.free !== true && this.model.get('selectedAddress')) {
+      if(this.model.get('selectedAddress').country != this.model.get('vendor_offer').listing.shipping.shipping_origin) {
         currentShippingPrice = this.model.get('internationalShipping');
         currentShippingBTCPrice = this.model.get('internationalShippingBTC');
         this.model.set('shippingType', 'international');
+        shippingType = 'international';
       } else {
         currentShippingPrice = this.model.get('domesticShipping');
         currentShippingBTCPrice = this.model.get('domesticShippingBTC');
         this.model.set('shippingType', 'domestic');
+        shippingType = 'domestic';
       }
     }
 
@@ -40,14 +56,6 @@ module.exports = Backbone.View.extend({
       currency: this.model.get('userCurrencyCode')
     }).format(currentShippingPrice));
 
-    this.model.set('recipient', recipient);
-
-    this.listenTo(this.model, 'change:selectedModerator change:selectedAddress', this.render);
-    this.render();
-  },
-
-  render: function(){
-    var self = this;
     loadTemplate('./js/templates/buyDetails.html', function(loadedTemplate) {
       self.$el.html(loadedTemplate(self.model.toJSON()));
       //this does not add it to the DOM, that is done by the parent view

js/views/settingsVw.js

@@ -503,9 +503,21 @@ module.exports = Backbone.View.extend({
         //don't add unless it comes from the model
         if(moderator.fromModel){
           this.$el.find('.js-settingsCurrentMods').append(modShort.el);
+          if(!this.$('.js-loadingMsgOld').hasClass('foldIn')){
+            //hide spinners after a while
+            setTimeout(()=> {
+              this.$('.js-loadingMsgOld').addClass('foldIn');
+            },2000);
+          }
         }
       }else{
         this.$el.find('.js-settingsNewMods').append(modShort.el);
+        if(!this.$('.js-loadingMsgNew').hasClass('foldIn')){
+          //hide spinners after a while
+          setTimeout(()=> {
+            this.$('.js-loadingMsgNew').addClass('foldIn');
+          },2000);
+        }
       }
       this.moderatorCount++;
       this.subViews.push(modShort);
@@ -557,10 +569,6 @@ module.exports = Backbone.View.extend({
             }
           });
         }
-        //hide spinners after a while
-        setTimeout(()=> {
-          this.$('.js-loadingMsg').addClass('foldIn');
-        },3000);
         this.firstLoadModerators = false;
       } else if (state === 'blocked') {
         // Since the Blocked Users View kicks off many server calls (one
@@ -811,9 +819,8 @@ module.exports = Backbone.View.extend({
         form = this.$el.find("#storeForm"),
         settingsData = {},
         moderatorsNew = this.$el.find('#storeForm .js-settingsNewMods .js-userShortView input:checked'),
-        moderatorList = this.userModel.get('moderators').map(function(moderatorObject){
-          return moderatorObject.guid;
-        }),
+        moderatorList = this.userModel.get('moderator_guids'),
+        manualModList,
         moderatorsUnChecked = this.$('#storeForm .js-settingsCurrentMods .js-userShortView input:not(:checked)'),
         onFail,
         $saveBtn = this.$('.js-saveStore');
@@ -830,6 +837,14 @@ module.exports = Backbone.View.extend({
       moderatorList.push($(this).data('guid'));
     });
 
+    //add any manually entered mods
+    manualModList = this.$('#addManualMods').val().split(',');
+    __.each(manualModList, function(mod){
+      if(mod.length === 40){
+        moderatorList.push(mod);
+      }
+    });
+
     settingsData.moderators = moderatorList.length > 0 ? moderatorList : "";
 
     onFail = (data) => {

main.js

@@ -154,6 +154,99 @@ if(fs.existsSync(__dirname + path.sep + ".." + path.sep + "OpenBazaar-Server" +
 // be closed automatically when the JavaScript object is GCed.
 var mainWindow = null;
 
+if (process.platform === "win32") {
+  initWin32();
+}
+
+function initWin32() {
+  var Registry = require('winreg');
+
+  var iconPath = path.join(process.env.LOCALAPPDATA, "app.ico");
+  registerProtocolHandlerWin32('ob', 'URL:OpenBazaar URL', iconPath, process.execPath);
+
+  /**
+   * To add a protocol handler, the following keys must be added to the Windows registry:
+   *
+   * HKEY_CLASSES_ROOT
+   *   $PROTOCOL
+   *     (Default) = "$NAME"
+   *     URL Protocol = ""
+   *     DefaultIcon
+   *       (Default) = "$ICON"
+   *     shell
+   *       open
+   *         command
+   *           (Default) = "$COMMAND" "%1"
+   *
+   * Source: https://msdn.microsoft.com/en-us/library/aa767914.aspx
+   *
+   * However, the "HKEY_CLASSES_ROOT" key can only be written by the Administrator user.
+   * So, we instead write to "HKEY_CURRENT_USER\Software\Classes", which is inherited by
+   * "HKEY_CLASSES_ROOT" anyway, and can be written by unprivileged users.
+   */
+
+  function registerProtocolHandlerWin32 (protocol, name, icon, command) {
+    var protocolKey = new Registry({
+      hive: Registry.HKCU, // HKEY_CURRENT_USER
+      key: '\\Software\\Classes\\' + protocol
+    })
+
+    setProtocol()
+
+    function setProtocol (err) {
+      if (err) log.error(err.message)
+      console.log(protocolKey);
+      protocolKey.set('', Registry.REG_SZ, name, setURLProtocol)
+    }
+
+    function setURLProtocol (err) {
+      if (err) log.error(err.message)
+      console.log(protocolKey);
+      protocolKey.set('URL Protocol', Registry.REG_SZ, '', setIcon)
+    }
+
+    function setIcon (err) {
+      if (err) log.error(err.message)
+
+      var iconKey = new Registry({
+        hive: Registry.HKCU,
+        key: '\\Software\\Classes\\' + protocol + '\\DefaultIcon'
+      })
+      iconKey.set('', Registry.REG_SZ, icon, setCommand)
+    }
+
+    function setCommand (err) {
+      if (err) log.error(err.message)
+
+      var commandKey = new Registry({
+        hive: Registry.HKCU,
+        key: '\\Software\\Classes\\' + protocol + '\\shell\\open\\command'
+      })
+      commandKey.set('', Registry.REG_SZ, '"' + command + '" "%1"', done)
+    }
+
+    function done (err) {
+      if (err) log.error(err.message)
+    }
+  }
+}
+
+var iShouldQuit = app.makeSingleInstance(function(commandLine, workingDirectory) {
+  var uri = "";
+  if (commandLine.length == 2) {
+    uri = commandLine[1];
+    openURL(uri);
+  }
+
+  if (mainWindow) {
+    if (mainWindow.isMinimized()) mainWindow.restore();
+    mainWindow.show();
+    mainWindow.focus();
+  }
+  return true;
+});
+if(iShouldQuit){app.quit();return;}
+
 // Quit when all windows are closed.
 app.on('window-all-closed', function() {
   // On OS X it is common for applications and their menu bar
@@ -398,7 +491,7 @@ ipcMain.on('set-badge', function(event, text) {
     app.dock.setBadge(String(text));
 });
 
-app.on('open-url', function(event, uri) {
+function openURL(uri) {
   var split_uri = uri.split('://');
   uri = split_uri[1];
 
@@ -410,5 +503,9 @@ app.on('open-url', function(event, uri) {
     mainWindow.webContents.send('external-route', uri);
   }  
 
+}
+
+app.on('open-url', function(event, uri) {
+  openURL(uri);
   event.preventDefault();
-});
+});

package.json

@@ -39,10 +39,11 @@
     "sortablejs": "^1.4.2",
     "taggle": "1.6.1",
     "underscore": "1.8.3",
-    "yargs": "^4.1.0"
+    "yargs": "^4.1.0",
+    "winreg": "^1.1.1"
   },
   "devDependencies": {
-    "electron-prebuilt": "0.37.5",
+    "electron-prebuilt": "0.37.7",
     "eslint": "1.9.0",
     "pre-commit": "^1.1.2",
     "valiquire": "0.3.0"