Merge branch 'master' into patch-1

Author: jjeffryes

js/data/defaultSearchProviders.js

@@ -13,10 +13,10 @@ const defaultSearchProviders = [
     id: 'duo',
     name: 'Duo',
     logo: '../imgs/duoSearchLogo.png',
-    search: 'https://ob2.duosear.ch/search',
+    search: '',
     listings: 'https://ob2.duosear.ch/search/listings',
-    torsearch: 'https://ob2.duosear.ch/search',
-    torlistings: 'https://ob2.duosear.ch/search/listings',
+    torsearch: '',
+    torlistings: '',
     locked: true,
   },
 ];

js/languages/en-US.json

@@ -434,7 +434,7 @@
         "resync": "Reload Transactions",
         "resyncHelper": "Synchronize your transactions if some are missing",
         "resyncBtn": "Reload Transactions",
-        "resyncComplete": "Your transactions have been synchronized. Check your wallet or transactions for new data.",
+        "resyncComplete": "Your transactions will begin resyncing. This may take five to ten minutes or longer.",
         "purge": "Purge Shared Files",
         "purgeHelper": "Delete cached files you are sharing with others",
         "purgeBtn": "Purge Files",

js/templates/modals/purchase/purchase.html

@@ -1,5 +1,4 @@
 <%
-const hasModerators = !!ob.listing.moderators && ob.listing.moderators.length
 // when multiple listings are supported, the prices array will have one price object for each
 const totalPrice = ob.prices[0].price + ob.prices[0].vPrice;
 %>
@@ -78,8 +77,7 @@ <h2 class="h4 required"><%= ob.polyT('purchase.paymentTypeTitle') %></h2>
             <div class="tx6 clrT2 margRSm"><%= ob.polyT('purchase.useShapeShift') %></div>
             <i class="shapeShiftIcon" style="background-image: url('../imgs/shapeShiftIcon.png');"></i>
           </div>
-          <div class="js-moderated-errors"></div>
-          <% if (hasModerators) { %>
+          <% if (ob.hasModerators) { %>
             <div class="js-moderatedOption">
               <input
                   type="checkbox"
@@ -97,9 +95,10 @@ <h2 class="h4 required"><%= ob.polyT('purchase.paymentTypeTitle') %></h2>
           <% } %>
         </div>
       </section>
-      <% if (hasModerators) { %>
+      <% if (ob.hasModerators) { %>
         <section class="contentBox padMd clrP clrBr clrSh3 showIfPay js-moderator">
           <h2 class="h4"><%= ob.polyT('purchase.moderatorTitle') %></h2>
+          <div class="js-moderated-errors"></div>
           <div class="js-moderatorsWrapper"></div>
         </section>
       <% } %>
@@ -175,7 +174,7 @@ <h2 class="h4">
       <i class="js-close cornerTR ion-ios-close-empty iconBtn clrP clrBr clrSh3 closeBtn"></i>
       <div class="js-actionBtn"></div>
       <div class="js-receipt"></div>
-      <% if (hasModerators) { %>
+      <% if (ob.hasModerators) { %>
         <hr class="clrBr js-moderatorNote">
         <div class="padSm txSm txCtr clrT2 js-moderatorNote">
           <%= ob.polyT('purchase.moderatorNote') %>

js/templates/userPage/userPage.html

@@ -38,8 +38,8 @@ <h1 class="txBg txUnb txUnl txGlow tabTitle js-tabTitle">
           <%= ob.processingButton({
             className: `btn clrP clrBr js-followBtn`,
             btnText: ob.followed ? ob.polyT('userPage.unfollow') : ob.polyT('userPage.follow'),
-          }) %>          
-          <a class="btn clrP clrBr hide js-moreableBtn"><%= ob.polyT('userPage.block') %></a>
+          }) %>
+          <a class="btn clrP clrBr hide js-moreableBtn TODO"><%= ob.polyT('userPage.block') %></a>
           <a class="iconBtn clrP clrBr js-moreBtn"><i class="ion-android-more-vertical"></i> </a>
         <% } %>
       </div>

js/utils/localServer.js

@@ -67,7 +67,7 @@ export default class LocalServer {
     }
 
     this._isRunning = true;
-    let serverStartArgs = ['start', '-t', ...commandLineArgs];
+    let serverStartArgs = ['start', ...commandLineArgs];
 
     // wire in our auth cookie
     if (global.authCookie) {

js/views/ModeratorCard.js

@@ -45,7 +45,7 @@ export default class extends BaseVw {
   }
 
   rotateSelectState() {
-    if (this.cardState === 'selected') {
+    if (this.cardState === 'selected' && !this.options.radioStyle) {
       this.changeSelectState(this.notSelected);
     } else {
       this.changeSelectState('selected');

js/views/modals/purchase/Purchase.js

@@ -446,6 +446,7 @@ export default class extends BaseModal {
         items: this.order.get('items').toJSON(),
         prices: this.prices,
         displayCurrency: app.settings.get('localCurrency'),
+        hasModerators: this.moderatorIDs.length,
       }));
 
       super.render();

js/views/search/Search.js

@@ -30,6 +30,7 @@ export default class extends baseVw {
     this.urlType = this.usingTor ? 'torlistings' : 'listings';
 
     this.sProvider = app.searchProviders[`default${this.torString}Provider`];
+    this.queryProvider = false;
 
     // if the  provider returns a bad URL, the user must select a provider
     if (is.not.url(this.providerUrl)) {
@@ -49,7 +50,6 @@ export default class extends baseVw {
       const matchedProvider =
         app.searchProviders.filter(p =>
           base === p.get('listings') || base === p.get('torlistings'));
-
       /* if the query provider doesn't exist, create a temporary provider model for it.
          One quirk to note: if a tor url is passed in while the user is in clear mode, and an
          existing provider has that tor url, that provider will be activated but will use its
@@ -58,10 +58,10 @@ export default class extends baseVw {
       if (!matchedProvider.length) {
         const queryOpts = {};
         queryOpts[`${this.usingTor ? 'tor' : ''}listings`] = `${subURL.origin}${subURL.pathname}`;
-        this.queryProvider = new ProviderMd(queryOpts);
+        this.queryProvider = true;
+        this.sProvider = new ProviderMd(queryOpts);
       } else {
         this.sProvider = matchedProvider[0];
-        this.queryProvider = null;
       }
     }
 
@@ -77,7 +77,7 @@ export default class extends baseVw {
     this.term = options.term || params.q || '';
     this.sortBySelected = options.sortBySelected || params.sortBy || '';
     // all parameters not specified above are assumed to be filters
-    this.filters = _.omit(params, ['q', 'p', 'ps', 'sortBy', 'providerQ']);
+    this.filters = _.omit(params, ['q', 'p', 'ps', 'sortBy', 'providerQ', 'network']);
 
     this.processTerm(this.term);
   }
@@ -114,7 +114,7 @@ export default class extends baseVw {
   get providerUrl() {
     // if a provider was created by the address bar query, use it instead.
     // return false if no provider is available
-    const currentProvider = this.queryProvider || this.sProvider;
+    const currentProvider = this.sProvider;
     return currentProvider && currentProvider.get(this.urlType);
   }
 
@@ -153,7 +153,7 @@ export default class extends baseVw {
       throw new Error('The provider must be in the collection.');
     }
     this.sProvider = md;
-    this.queryProvider = null;
+    this.queryProvider = false;
     if (this.mustSelectDefault) {
       this.mustSelectDefault = false;
       this.makeDefaultProvider();
@@ -175,6 +175,10 @@ export default class extends baseVw {
   }
 
   makeDefaultProvider() {
+    if (app.searchProviders.indexOf(this.sProvider) === -1) {
+      throw new Error('The provider to be made the default must be in the collection.');
+    }
+
     app.searchProviders[`default${this.torString}Provider`] = this.sProvider;
     this.getCachedEl('.js-makeDefaultProvider').addClass('hide');
   }
@@ -184,8 +188,8 @@ export default class extends baseVw {
   }
 
   addQueryProvider() {
-    if (this.queryProvider) app.searchProviders.add(this.queryProvider);
-    this.activateProvider(this.queryProvider);
+    if (this.queryProvider) app.searchProviders.add(this.sProvider);
+    this.activateProvider(this.sProvider);
   }
 
   clickAddQueryProvider() {
@@ -393,7 +397,7 @@ export default class extends baseVw {
         errTitle,
         errMsg,
         providerLocked: this.sProvider.get('locked'),
-        isQueryProvider: !!this.queryProvider,
+        isQueryProvider: this.queryProvider,
         isDefaultProvider: this.sProvider === app.searchProviders.defaultProvider,
         emptyData,
         ...state,