Merge branch 'development' into 358-modal-full-screen

LiskArchive · Jun 9, 2017 · e82f700 · e82f700
2 parents 57a1690 + d6ea9b0
commit e82f700
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/src/components/delegateRegistration/delegateRegistration.js b/src/components/delegateRegistration/delegateRegistration.js
@@ -8,7 +8,10 @@ import './delegateRegistration.less';
  */
 app.component('delegateRegistration', {
   template: require('./delegateRegistration.pug')(),
-  controller($scope, $mdDialog, delegateApi, Account, dialog, $rootScope) {
+  bindings: {
+    closeDialog: '&',
+  },
+  controller($scope, delegateApi, Account, dialog, $rootScope) {
     function checkPendingRegistration() {
       delegateApi.getDelegate({
         username: $scope.username,
@@ -42,7 +45,7 @@ app.component('delegateRegistration', {
                     checkPendingRegistration();
                   });
                   $scope.reset(form);
-                  $mdDialog.hide();
+                  this.closeDialog();
                 });
             })
             .catch((error) => {
@@ -74,7 +77,7 @@ app.component('delegateRegistration', {
      */
     $scope.cancel = (form) => {
       $scope.reset(form);
-      // $mdDialog.hide();
+      this.closeDialog();
     };
   },
 });
diff --git a/src/components/delegates/vote.pug b/src/components/delegates/vote.pug
@@ -14,7 +14,6 @@ div.dialog-vote(aria-label='Vote for delegates')
             md-chip-template {{$chip.username}}
             md-autocomplete(flex, required, md-input-minlength='2', md-no-cache='false', md-selected-item='$ctrl.selectedVoteDelegate', md-search-text='$ctrl.voteSearchText', md-items='delegate in $ctrl.delegateApi.voteAutocomplete($ctrl.voteSearchText, $ctrl.votedDict)', md-item-text='delegate.username', md-require-match, placeholder='Search by username')
               span(md-highlight-text='$ctrl.voteSearchText') {{delegate.username}}
-        md-divider(ng-if='$ctrl.voteList.length && $ctrl.unvoteList.length')
         div
           h4 Remove vote from
           md-chips(ng-model='$ctrl.unvoteList', md-require-match='true', md-max-chips='33')

diff --git a/src/components/transactions/transactions.pug b/src/components/transactions/transactions.pug
@@ -1,9 +1,9 @@
 md-card.offline-hide
-  md-card-content(ng-show='$ctrl.loaded')
-    md-content(layout='row', layout-align='start center', layout-padding, ng-show='!$ctrl.transactions.length')
+  md-card-content()
+    md-content(layout='row', layout-align='start center', layout-padding, ng-show='!$ctrl.transactions.length && $ctrl.loaded')
       div(flex)
       span.empty No transactions
-    md-content(layout='column', layout-align='center center', ng-hide='!$ctrl.transactions.length')
+    md-content(layout='column', layout-align='center center')
       md-table-container(ng-show='$ctrl.transactions.length')
         table(md-table)
           thead(md-head)