[TASK] Add rpTicker directive

ripple · Jan 29, 2015 · ac86533 · ac86533
1 parent 6710786
commit ac86533
Show file tree

Hide file tree

Showing 5 changed files with 61 additions and 58 deletions.
diff --git a/src/jade/client/index.jade b/src/jade/client/index.jade
@@ -48,7 +48,7 @@ div#wrapper
     .landingContainer
 
       .tickerWrapper(ng-if="!loginStatus")
-        div#ticker
+        rp-ticker#ticker
 
       .loginContainer
 

diff --git a/src/js/config-example.js b/src/js/config-example.js
@@ -76,7 +76,44 @@ var Options = {
   advanced_feature_switch: false,
 
   // Default gateway max trust amount under 'simplfied' view ie when advanced_feature_switch is false in trust/gateway page
-  gateway_max_limit: 1000000000
+  gateway_max_limit: 1000000000,
+
+  ticker: {
+    markets: [
+      {
+        base: {currency: "XRP"},
+        counter: {currency: "USD", issuer: "rMwjYedjc7qqtKYVLiAccJSmCwih4LnE2q"}
+      },
+      {
+        base: {currency: "XRP"},
+        counter: {currency: "USD", issuer: "rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B"}
+      },
+      {
+        base: {currency: "XRP"},
+        counter: {currency:"BTC", issuer: "rMwjYedjc7qqtKYVLiAccJSmCwih4LnE2q"}
+      },
+      {
+        base: {currency: "XRP"},
+        counter: {currency:"BTC", issuer: "rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B"}
+      },
+      {
+        base: {currency: "XRP"},
+        counter: {currency:"CNY", issuer: "razqQKzJRdB4UxFPWf5NEpEG3WMkmwgcXA"}
+      },
+      {
+        base: {currency: "XRP"},
+        counter: {currency:"JPY", issuer: "rMAz5ZnK73nyNUL4foAvaxdreczCkG3vA6"}
+      },
+      {
+        counter: {currency: "XRP"},
+        base: {currency: "JPY", issuer: "r94s8px6kSw1uZ1MV98dhSRTvc6VMPoPcN"}
+      },
+      {
+        base: {currency: "CNY", issuer: "rnuF96W4SZoCJmbHYBFoJZpR8eCaxNvekK"},
+        counter: {currency: "XRP"}
+      }
+    ]
+  }
 };
 
 // Load client-side overrides

diff --git a/src/js/directives/ticker.js b/src/js/directives/ticker.js
@@ -0,0 +1,20 @@
+var module = angular.module('app');
+
+/**
+ * Ticker
+ */
+module.directive('rpTicker', function() {
+  return {
+    restrict: 'E',
+    link: function() {
+      var ticker = TickerWidget({
+        url: API, // TODO not a good idea to have an API global variable
+        id: "ticker"
+      });
+
+      ticker.load({
+        markets: Options.ticker.markets
+      });
+    }
+  };
+});
diff --git a/src/js/entry/web.js b/src/js/entry/web.js
@@ -15,6 +15,7 @@ require('../directives/datalinks');
 require('../directives/errors');
 require('../directives/qr');
 require('../directives/marketchart');
+require('../directives/ticker');
 require('../filters/filters');
 require('../filters/amountHasIssuer.js');
 require('../services/globalwrappers');

diff --git a/src/js/tabs/login.js b/src/js/tabs/login.js
@@ -274,59 +274,4 @@ LoginTab.prototype.angular = function (module) {
   }]);
 };
 
-
-
-module.exports = LoginTab;
-
-
-  /**
-   *
-   * Initialize the ticker
-   * @link https://github.com/ripple/ripplecharts-frontend/tree/master/src/embed
-   *
-  **/
-
-setTimeout (function () {
-
-  var ticker = TickerWidget({
-    url : API,
-    id  : "ticker"
-  });
-
-  ticker.load({
-    markets: [ 
-      {
-        base: {"currency":"XRP"},
-        counter: {"currency":"USD","issuer":"rMwjYedjc7qqtKYVLiAccJSmCwih4LnE2q"}
-      },
-      {
-        base: {currency:"XRP"},
-        counter: {"currency":"USD","issuer":"rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B"}
-      },
-      {
-        base: {"currency":"XRP"},
-        counter: {currency:"BTC","issuer":"rMwjYedjc7qqtKYVLiAccJSmCwih4LnE2q"}
-      },
-      {
-        base: {"currency":"XRP"},
-        counter: {currency:"BTC","issuer":"rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B"}
-      },
-      {
-        base: {"currency":"XRP"},
-        counter: {currency:"CNY","issuer":"razqQKzJRdB4UxFPWf5NEpEG3WMkmwgcXA"}
-      },
-      {
-        base: {"currency":"XRP"},
-        counter: {currency:"JPY","issuer":"rMAz5ZnK73nyNUL4foAvaxdreczCkG3vA6"}
-      },
-      {
-        counter: {currency:"XRP"},
-        base: {"currency":"JPY","issuer":"r94s8px6kSw1uZ1MV98dhSRTvc6VMPoPcN"}
-      },
-      {
-        base: {currency:"CNY","issuer":"rnuF96W4SZoCJmbHYBFoJZpR8eCaxNvekK"},
-        counter: {"currency":"XRP"} 
-      }
-    ]  
-  });
-}, 100);
+module.exports = LoginTab;