Animations work; fix render issue; clean up leftovers

sowbug · Feb 17, 2014 · 0448412 · 0448412
1 parent ecd6cfc
commit 0448412
Show file tree

Hide file tree

Showing 8 changed files with 63 additions and 22 deletions.
diff --git a/chrome_app/app.js b/chrome_app/app.js
@@ -22,7 +22,7 @@
 
 'use strict';
 
-angular.module('app', [])
+angular.module('app', ['ngAnimate'])
  .factory('api_client', function() {
  return new ApiClient();
  })

diff --git a/chrome_app/electrum.js b/chrome_app/electrum.js
@@ -97,11 +97,6 @@ Electrum.prototype.handleResponse = function(o) {
  this.callbacks[id].resolve(o["result"]);
  delete this.callbacks[id];
  this.pendingRpcCount--;
- $.event.trigger({
- "type": "apply",
- "message": undefined,
- time: new Date()
- });
  } else {
  logInfo("notification from electrum", o);
  var ALLOWED_METHODS = [
@@ -117,6 +112,11 @@ Electrum.prototype.handleResponse = function(o) {
  });
  }
  }
+ $.event.trigger({
+ "type": "apply",
+ "message": undefined,
+ time: new Date()
+ });
 };
 
 Electrum.prototype.onSocketReceive = function(receiveInfo) {

diff --git a/chrome_app/index.html b/chrome_app/index.html
@@ -434,7 +434,7 @@
  </a>
  </li>
  <li>
- <p class="navbar-text text-info small"><span ng-bind="appName"></span>&nbsp;<span ng-bind="appVersion"></span></p>
+ <p class="navbar-text text-info small"><span ng-bind="appVersion"></span></p>
  </li>
  <li>
  <p class="navbar-text text-info small" ng-if="getCurrentHeight() != 0">Block <span ng-bind="getCurrentHeight()"></span></p>
@@ -550,6 +550,7 @@ <h4 class="modal-title" id="address-detail-label" ng-bind="w.selectedAddress"></
  <script type="text/javascript" src="js/jquery/jquery.qrcode.min.js"></script>
  <script type="text/javascript" src="js/bootstrap/js/bootstrap.min.js"></script>
  <script type="text/javascript" src="js/angular/angular.min.js"></script>
+ <script type="text/javascript" src="js/angular/angular-animate.min.js"></script>
  <script type="text/javascript" src="happynine.min.js"></script>
  </body>
 </html>
diff --git a/chrome_app/js/angular/angular-animate.min.js b/chrome_app/js/angular/angular-animate.min.js
diff --git a/chrome_app/js/angular/angular-animate.min.js.map b/chrome_app/js/angular/angular-animate.min.js.map
diff --git a/chrome_app/js/angular/angular.min.js.map b/chrome_app/js/angular/angular.min.js.map
diff --git a/chrome_app/node.js b/chrome_app/node.js
@@ -36,10 +36,6 @@ function Node() {
  this.extendedPublicBase58 = undefined;
  this.fingerprint = undefined;
  this.parentFingerprint = undefined;
- this.path = undefined;
-
- this.nextChangeAddressIndex = 8;
- this.nextPublicAddressIndex = 8;
 
  this.publicAddresses = {};
  this.changeAddresses = {};
@@ -58,10 +54,7 @@ function Node() {
  o["ext_prv_enc"] = this.extendedPrivateEncrypted;
  o["ext_pub_b58"] = this.extendedPublicBase58;
  o["fp"] = this.fingerprint;
- o["next_change_addr"] = this.nextChangeAddressIndex;
- o["next_pub_addr"] = this.nextPublicAddressIndex;
  o["pfp"] = this.parentFingerprint;
- o["path"] = this.path;
  return o;
  };
 
@@ -92,12 +85,6 @@ Node.fromStorableObject = function(o) {
  s.extendedPublicBase58 = o["ext_pub_b58"];
  if (o["fp"] != undefined)
  s.fingerprint = o["fp"];
- if (o["next_change_addr"] != undefined)
- s.nextChangeAddressIndex = o["next_change_addr"];
- if (o["next_pub_addr"] != undefined)
- s.nextPublicAddressIndex = o["next_pub_addr"];
- if (o["path"] != undefined)
- s.path = o["path"];
  if (o["pfp"] != undefined)
  s.parentFingerprint = o["pfp"];
 

diff --git a/chrome_app/styles.css b/chrome_app/styles.css
@@ -65,7 +65,17 @@ html, body {
  color: green;
 }
 
-.recent-tx.ng-enter, .recent-tx.ng-leave {
+.recent-tx.ng-enter,
+.recent-tx.ng-leave {
  -webkit-transition: 0.5s linear all;
- transition: 0.5s linear all;
+ transition: 1s linear all;
+}
+
+.recent-tx.ng-enter,
+.recent-tx.ng-leave.ng-leave-active {
+ opacity: 0;
+}
+.recent-tx.ng-leave,
+.recent-tx.ng-enter.ng-enter-active {
+ opacity: 1;
 }