From a234055e5f69fdb61cc5da337081cc8a1e33e6ce Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Tue, 6 Mar 2018 08:18:18 -0500
Subject: [PATCH] masked values from jslib

---
 jslib                                            |  2 +-
 src/popup/app/vault/vaultViewCipherController.js | 16 ----------------
 src/popup/app/vault/views/vaultViewCipher.html   |  4 ++--
 3 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/jslib b/jslib
index 1f2cf2bcdfd..a3beb04f7e0 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit 1f2cf2bcdfddc68a6d9ee0ed732d00c8bec65ad4
+Subproject commit a3beb04f7e09d548bc5223a702f76b9f4e8a4991
diff --git a/src/popup/app/vault/vaultViewCipherController.js b/src/popup/app/vault/vaultViewCipherController.js
index 8f10fa87dea..017bb5f0a56 100644
--- a/src/popup/app/vault/vaultViewCipherController.js
+++ b/src/popup/app/vault/vaultViewCipherController.js
@@ -23,13 +23,6 @@ angular
         }).then(function (model) {
             $timeout(function() {
                 $scope.cipher = model;
-
-                if (model.type == constantsService.cipherType.login && model.login) {
-                    if (model.login.password) {
-                        $scope.cipher.maskedPassword = $scope.maskValue(model.login.password);
-                    }
-                }
-
                 if (model.login && model.login.totp && (cipherObj.organizationUseTotp || tokenService.getPremium())) {
                     totpUpdateCode();
                     totpTick();
@@ -89,15 +82,6 @@ angular
             toastr.info(i18n.browserNotSupportClipboard);
         };
 
-        $scope.maskValue = function (value) {
-            if (!value) {
-                return value;
-            }
-
-            var masked = '••••••••';
-            return masked;
-        };
-
         $scope.clipboardSuccess = function (e, type, aType) {
             e.clearSelection();
             $analytics.eventTrack('Copied ' + aType);
diff --git a/src/popup/app/vault/views/vaultViewCipher.html b/src/popup/app/vault/views/vaultViewCipher.html
index 7cd5ec8ef53..fd5f8130726 100644
--- a/src/popup/app/vault/views/vaultViewCipher.html
+++ b/src/popup/app/vault/views/vaultViewCipher.html
@@ -45,7 +45,7 @@
                             </a>
                         </div>
                         <span class="item-label">{{i18n.password}}</span>
-                        <span ng-show="!showPassword" class="monospaced">{{cipher.maskedPassword}}</span>
+                        <span ng-show="!showPassword" class="monospaced">{{cipher.login.maskedPassword}}</span>
                         <span id="password" ng-show="showPassword" class="monospaced">{{cipher.login.password}}</span>
                     </div>
                     <div class="list-section-item totp" ng-class="{'low': totpLow}" ng-if="cipher.login.totp && totpCode">
@@ -219,7 +219,7 @@
                         {{field.value || '&nbsp;'}}
                     </div>
                     <div ng-if="field.type === constants.fieldType.hidden">
-                        <span ng-show="!field.showValue" class="monospaced">{{maskValue(field.value)}}</span>
+                        <span ng-show="!field.showValue" class="monospaced">{{field.maskedValue}}</span>
                         <span ng-show="field.showValue" class="monospaced">{{field.value}}</span>
                     </div>
                     <div ng-if="field.type === constants.fieldType.boolean">