Merge pull request #1705 from OpenBazaar/restoreDottedBorderOnCustomize

Fix Missing Dotted Line on Customize

Author: jjeffryes

.eslintrc

@@ -50,7 +50,6 @@
     "no-extend-native": 2,
     "no-extra-bind": 2,
     "no-extra-boolean-cast": 2,
-    "no-extra-parens": [2, "all", {"nestedBinaryExpressions": false}],
     "no-extra-semi": 2,
     "no-fallthrough": 2,
     "no-floating-decimal": 2,

css/obBase.css

@@ -356,7 +356,7 @@ h6, .h6 {
 #obContainer.customizeUserPage {
   overflow: hidden;
   border: 5px dashed #fff;
-  height: 100%;
+  height: calc(100% - 76px);
   animation: borderDashedFade .35s normal linear;
 }
 

js/languages/en-US.json

@@ -185,7 +185,7 @@
   "SSLIsOn": "SSL is on",
   "SSLIsOff": "SSL is off",
   "LibbitcoinServerAddress": "Libbitcoin Server Address",
-  "LibbitcoinOfflineWarning":"The Libbitcoin Server is not responding. Transactions can still be made, but payments will not complete until Libbitcoin is back online.",
+  "LibbitcoinOfflineWarning":"Contacting the Libbitcoin Server. Transactions may be delayed until the Libbitcoin server is connected.",
   "libbitcoinPlaceholder": "tcp://serveraddress:port or leave this field blank to use the default value (recommended)",
   "SMTPNotificationsWarning": "Turn email notifications on/off",
   "SMTPNotifications": "SMTP Notifications",

js/router.js

@@ -178,11 +178,10 @@ module.exports = Backbone.Router.extend({
 
     if (callback) callback.apply(this, args);
   },
-
+  
   cleanup: function() {
     app.loadingModal.close();
     app.simpleMessageModal.close();
-    $('#obContainer').removeClass('customizeUserPage box-borderDashed noScrollBar overflowHidden');
     window.obEventBus.trigger('cleanNav');
   },
 

js/start.js

@@ -47,7 +47,7 @@ var Polyglot = require('node-polyglot'),
     cCode = "",
     $html = $('html'),
     LoadingModal = require('./views/loadingModal'),
-    SimpleMessageModal = require('./views/SimpleMessageModal'),
+    SimpleMessageModal = require('./views/simpleMessageModal'),
     ServerConfigsCl = require('./collections/serverConfigsCl'),
     ServerConnectModal = require('./views/serverConnectModal'),
     OnboardingModal = require('./views/onboardingModal'),
@@ -460,7 +460,7 @@ var loadProfile = function(landingRoute, onboarded) {
               };
 
               // any lang changes after our app has loaded will need an app re-start to fully take effect
-              user.on('change:language', function(md, lang) {
+              user.on('change:language', function() {
                 var restartWarning;
 
                 restartWarning = new Dialog({

js/views/baseModal.js

@@ -53,8 +53,7 @@ baseModal = baseVw.extend({
   },
 
   __onDocKeypress: function(e) {
-    var openModals = baseModal.__openModals,
-        topModal = this.__getTopModal();
+    var topModal = this.__getTopModal();
 
     if (this.__options.dismissOnEscPress && e.keyCode === 27 &&
       topModal && topModal === this) {
@@ -83,11 +82,10 @@ baseModal = baseVw.extend({
       var aZindex = parseInt(window.getComputedStyle(a.modal.el).zIndex) || 0,
           bZindex = parseInt(window.getComputedStyle(b.modal.el).zIndex) || 0;
 
-      if (aZindex ===  bZindex) {
+      if (aZindex === bZindex) {
         return (a.index < b.index) ? -1 : (a.index > b.index) ? 1 : 0;
-      } else {
-        return (aZindex < bZindex) ? -1 : (aZindex > bZindex) ? 1 : 0;
-      }      
+      }
+      return (aZindex < bZindex) ? -1 : (aZindex > bZindex) ? 1 : 0;
     });
 
     return openModals[openModals.length - 1] && openModals[openModals.length - 1].modal;

js/views/transactionsVw.js

@@ -367,8 +367,7 @@ module.exports = pageVw.extend({
           tempAnchor.href = window.URL.createObjectURL(dataBlob);
           tempAnchor.download = ('export_'+saveDate.toLocaleString(window.lang)+'.csv').replace(/,/g, '_');
           tempAnchor.click();
-        },
-        self = this;
+        };
 
     //clear existing data
     this.currentExportData = [];
@@ -399,12 +398,10 @@ module.exports = pageVw.extend({
 
     return $.when.apply(null, calls)
         .fail(function(){
-          self.registerChild(
-            new Dialog({
-              title: window.polyglot.t('errorMessages.getError'),
-              message: window.polyglot.t('errorMessages.serverError')
-            })
-          );
+          app.simpleMessageModal.open({
+            title: window.polyglot.t('errorMessages.getError'),
+            message: window.polyglot.t('errorMessages.serverError')
+          });
 
           calls.forEach(call => {
             call.abort();

js/views/userPageVw.js

@@ -185,7 +185,7 @@ UserPageVw = pageVw.extend({
     this.followerFetchTotal = 0;
     this.itemFetchParameters = {};
     this.model = new Backbone.Model();
-    this.globalUserProfile = options.userProfile;
+    //this.globalUserProfile = options.userProfile;
     this.userProfile = new userProfileModel();
     //models have to be passed the dynamic URL
     this.userProfile.urlRoot = options.userModel.get('serverUrl') + "profile";
@@ -211,6 +211,7 @@ UserPageVw = pageVw.extend({
     this.showNSFWContent = this.showNSFW;
     this.currentItemHash = options.itemHash;
     this.$obContainer = $('#obContainer');
+    /*
     //hold changes to the page for undoing, such as custom colors
     this.undoCustomAttributes = {
       profile: {
@@ -220,6 +221,7 @@ UserPageVw = pageVw.extend({
         background_color: ""
       }
     };
+    */
 
     this.loadingDeferred = $.Deferred();
 
@@ -383,11 +385,13 @@ UserPageVw = pageVw.extend({
         self.fetchFollowing();
         self.getIsModerator();
         self.fetchListings();
+        /*
         //save state of the page
         self.undoCustomAttributes.background_color = self.model.get('page').profile.background_color;
         self.undoCustomAttributes.primary_color = self.model.get('page').profile.primary_color;
         self.undoCustomAttributes.secondary_color = self.model.get('page').profile.secondary_color;
         self.undoCustomAttributes.text_color = self.model.get('page').profile.text_color;
+        */
         self.setCustomStyles();
         self.setState(self.state, self.currentItemHash, { replaceHistory: true });
         self.$backToTop = self.$('.backToTop');
@@ -573,7 +577,7 @@ UserPageVw = pageVw.extend({
     this.$el.find('.js-unfollow').removeClass('confirm');
     this.$el.find('.js-removemoderator').removeClass('confirm');
     this.$el.find('.user-page-header-slim-bg-cover').removeClass('user-page-header-slim-bg-cover-customize');
-    this.$obContainer[0].classList.remove("box-borderDashed", "noScrollBar", "overflowHidden");
+    this.$obContainer.removeClass("customizeUserPage", "noScrollBar", "overflowHidden");
     //unhide the ones that are needed
     if (this.options.ownPage === true) {
       if (state === "listing" || state === "listingOld") {
@@ -584,7 +588,7 @@ UserPageVw = pageVw.extend({
         this.$el.find('.js-pageCustomizationButtons').removeClass('hide');
         this.$el.find('#customizeControls').removeClass('hide');
         this.$el.find('.user-page-header-slim-bg-cover').addClass('user-page-header-slim-bg-cover-customize');
-        this.$obContainer[0].classList.add("box-borderDashed", "noScrollBar", "overflowHidden");
+        this.$obContainer.addClass("customizeUserPage", "noScrollBar", "overflowHidden");
       } else {
         this.$el.find('.js-pageButtons').removeClass('hide');
       }
@@ -1483,7 +1487,7 @@ UserPageVw = pageVw.extend({
           }
 
           //refresh the universal profile model
-          self.globalUserProfile.fetch();
+          //self.globalUserProfile.fetch();
         } else if (data.success === false && !self.isRemoved()){
           app.simpleMessageModal.open({
             title: window.polyglot.t('errorMessages.serverError'),