diff --git a/package.json b/package.json index b0ca257af..9e9a903cb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bitflux-openfin", - "version": "9.0.0", + "version": "9.1.0", "scripts": { "test": "grunt ci", "postinstall": "cd node_modules/BitFlux && npm i" diff --git a/src/app.js b/src/app.js index cdb61094c..f844ba583 100644 --- a/src/app.js +++ b/src/app.js @@ -1,42 +1,42 @@ (function() { 'use strict'; - angular.module('OpenFinD3FC', [ + angular.module('StockFlux', [ 'ngAnimate', - 'openfin.main', - 'openfin.showcase', - 'openfin.toolbar', - 'openfin.icon', - 'openfin.search', - 'openfin.favourites', - 'openfin.sidebar', - 'openfin.filters', - 'openfin.star', - 'openfin.tearout', - 'openfin.minichart', - 'openfin.scroll', - 'openfin.closedWindows', - 'openfin.closedCard', - 'openfin.config', - 'openfin.version' + 'stockflux.main', + 'stockflux.showcase', + 'stockflux.toolbar', + 'stockflux.icon', + 'stockflux.search', + 'stockflux.favourites', + 'stockflux.sidebar', + 'stockflux.filters', + 'stockflux.star', + 'stockflux.tearout', + 'stockflux.minichart', + 'stockflux.scroll', + 'stockflux.closedWindows', + 'stockflux.closedCard', + 'stockflux.config', + 'stockflux.version' ]); - angular.module('openfin.main', []); - angular.module('openfin.showcase', ['openfin.selection', 'openfin.quandl', 'openfin.config']); - angular.module('openfin.toolbar', ['openfin.currentWindow', 'openfin.closedWindows']); - angular.module('openfin.icon', []); - angular.module('openfin.search', ['openfin.quandl', 'openfin.selection', 'openfin.currentWindow']); - angular.module('openfin.favourites', ['openfin.quandl', 'openfin.selection', 'openfin.currentWindow']); - angular.module('openfin.sidebar', []); - angular.module('openfin.filters', []); - angular.module('openfin.star', ['openfin.selection']); - angular.module('openfin.tearout', ['openfin.geometry', 'openfin.hover', 'openfin.currentWindow', 'openfin.config']); - angular.module('openfin.minichart', ['openfin.quandl']); - angular.module('openfin.store', []); - angular.module('openfin.currentWindow', []); - angular.module('openfin.scroll', []); - angular.module('openfin.closedWindows', ['openfin.closedCard']); - angular.module('openfin.closedCard', []); - angular.module('openfin.config', []); - angular.module('openfin.version', ['openfin.currentWindow']); + angular.module('stockflux.main', []); + angular.module('stockflux.showcase', ['stockflux.selection', 'stockflux.quandl', 'stockflux.config']); + angular.module('stockflux.toolbar', ['stockflux.currentWindow', 'stockflux.closedWindows']); + angular.module('stockflux.icon', []); + angular.module('stockflux.search', ['stockflux.quandl', 'stockflux.selection', 'stockflux.currentWindow']); + angular.module('stockflux.favourites', ['stockflux.quandl', 'stockflux.selection', 'stockflux.currentWindow']); + angular.module('stockflux.sidebar', []); + angular.module('stockflux.filters', []); + angular.module('stockflux.star', ['stockflux.selection']); + angular.module('stockflux.tearout', ['stockflux.geometry', 'stockflux.hover', 'stockflux.currentWindow', 'stockflux.config']); + angular.module('stockflux.minichart', ['stockflux.quandl']); + angular.module('stockflux.store', []); + angular.module('stockflux.currentWindow', []); + angular.module('stockflux.scroll', []); + angular.module('stockflux.closedWindows', ['stockflux.closedCard']); + angular.module('stockflux.closedCard', []); + angular.module('stockflux.config', []); + angular.module('stockflux.version', ['stockflux.currentWindow']); }()); diff --git a/src/assets/png/close_hover.png b/src/assets/png/close_hover.png deleted file mode 100644 index 12e3424eb..000000000 Binary files a/src/assets/png/close_hover.png and /dev/null differ diff --git a/src/assets/png/closed_tabs_hover.png b/src/assets/png/closed_tabs_hover.png deleted file mode 100644 index 09d12a0db..000000000 Binary files a/src/assets/png/closed_tabs_hover.png and /dev/null differ diff --git a/src/assets/png/closed_tabs_small_hover.png b/src/assets/png/closed_tabs_small_hover.png deleted file mode 100644 index 5e50129ce..000000000 Binary files a/src/assets/png/closed_tabs_small_hover.png and /dev/null differ diff --git a/src/assets/png/compact_hover.png b/src/assets/png/compact_hover.png deleted file mode 100644 index 64d31dd5c..000000000 Binary files a/src/assets/png/compact_hover.png and /dev/null differ diff --git a/src/assets/png/full_view_hover.png b/src/assets/png/full_view_hover.png deleted file mode 100644 index 9279c556e..000000000 Binary files a/src/assets/png/full_view_hover.png and /dev/null differ diff --git a/src/assets/png/maximise_hover.png b/src/assets/png/maximise_hover.png deleted file mode 100644 index 38394b648..000000000 Binary files a/src/assets/png/maximise_hover.png and /dev/null differ diff --git a/src/assets/png/minimise_hover.png b/src/assets/png/minimise_hover.png deleted file mode 100644 index 01d5c2bfd..000000000 Binary files a/src/assets/png/minimise_hover.png and /dev/null differ diff --git a/src/assets/png/normal_size_hover.png b/src/assets/png/normal_size_hover.png deleted file mode 100644 index d5e52b382..000000000 Binary files a/src/assets/png/normal_size_hover.png and /dev/null differ diff --git a/src/closedWindows/closedCard/closedCard-controller.js b/src/closedWindows/closedCard/closedCard-controller.js index e9cc3b16c..59b22937d 100644 --- a/src/closedWindows/closedCard/closedCard-controller.js +++ b/src/closedWindows/closedCard/closedCard-controller.js @@ -9,6 +9,6 @@ } ClosedCardCtrl.$inject = []; - angular.module('openfin.closedCard') + angular.module('stockflux.closedCard') .controller('ClosedCardCtrl', ClosedCardCtrl); }()); diff --git a/src/closedWindows/closedCard/closedCard-directive.js b/src/closedWindows/closedCard/closedCard-directive.js index e1595f6af..2e822c55e 100644 --- a/src/closedWindows/closedCard/closedCard-directive.js +++ b/src/closedWindows/closedCard/closedCard-directive.js @@ -1,7 +1,7 @@ (function() { 'use strict'; - angular.module('openfin.closedCard') + angular.module('stockflux.closedCard') .directive('closedCard', [() => { return { restrict: 'E', diff --git a/src/closedWindows/closedWindowList/closedWindowList-controller.js b/src/closedWindows/closedWindowList/closedWindowList-controller.js index 96e5c17e0..0645dcb0b 100644 --- a/src/closedWindows/closedWindowList/closedWindowList-controller.js +++ b/src/closedWindows/closedWindowList/closedWindowList-controller.js @@ -18,6 +18,6 @@ } ClosedWindowListCtrl.$inject = []; - angular.module('openfin.closedWindows') + angular.module('stockflux.closedWindows') .controller('ClosedWindowListCtrl', ClosedWindowListCtrl); }()); diff --git a/src/closedWindows/closedWindowList/closedWindowList-directive.js b/src/closedWindows/closedWindowList/closedWindowList-directive.js index ce0292c2b..1e06bdd9c 100644 --- a/src/closedWindows/closedWindowList/closedWindowList-directive.js +++ b/src/closedWindows/closedWindowList/closedWindowList-directive.js @@ -1,7 +1,7 @@ (function() { 'use strict'; - angular.module('openfin.closedWindows') + angular.module('stockflux.closedWindows') .directive('closedWindowList', [() => { return { restrict: 'E', diff --git a/src/config-service.js b/src/config-service.js index 536801e69..758883e6e 100644 --- a/src/config-service.js +++ b/src/config-service.js @@ -2,7 +2,9 @@ const RESIZE_NO_LIMIT = 50000; const BITFLUX_STOCK_AMOUNT = 1200; - const BITFLUX_INITIAL_PROPORTION = 31 / BITFLUX_STOCK_AMOUNT; + const BITFLUX_INITIAL_PROPORTION = 16 * 7 / BITFLUX_STOCK_AMOUNT; // ~4 months + const TEAROUT_WINDOW_OFFSET = [268, 65]; + const TEAROUT_WINDOW_OFFSET_COMPACT = [218, 47]; // Be very careful changing the line below. It is replaced with a string.replace in the grunt build // to disable the right click menu in release. @@ -75,8 +77,8 @@ }; } - getTopCardOffset() { - return [268, 65]; + getTopCardOffset(compact) { + return compact ? TEAROUT_WINDOW_OFFSET_COMPACT : TEAROUT_WINDOW_OFFSET; } getInitialBitfluxProportion() { @@ -89,7 +91,7 @@ } ConfigService.$inject = []; - angular.module('openfin.config') + angular.module('stockflux.config') .service('configService', ConfigService); }()); diff --git a/src/icon/icon-controller.js b/src/icon/icon-controller.js index 6bb95644b..d15ab50d8 100644 --- a/src/icon/icon-controller.js +++ b/src/icon/icon-controller.js @@ -5,88 +5,39 @@ constructor($scope) { this.$scope = $scope; - - this.setup(); - } - - setup() { - var name = this.$scope.name; - - var dict = {}, - _active = '_active', - _hovered = '_hovered'; - - dict[name + _active] = false; - dict[name + _hovered] = false; - - function active(value) { - if (!arguments.length) { - return dict[name + _active]; - } - - dict[name + _active] = value; - } - - function hovered(value) { - if (!arguments.length) { - return dict[name + _hovered]; - } - - dict[name + _hovered] = value; - } + this.active = false; this.urls = { - inactive: name, - hover: name + '_hover', - active: name + '_active' - }; - - this.icon = { - active: active, - hovered: hovered + inactive: $scope.name, + active: $scope.name + '_active' }; } enter() { - this.icon.hovered(true); + this.active = true; } leave() { - this.icon.hovered(false); - this.icon.active(false); + this.active = false; } url() { - if (this.icon.active()) { - return this.urls.active; - } else if (this.icon.hovered()) { - return this.urls.hover; - } else { - return this.urls.inactive; - } - } - - mouseDown(e, name) { - if (e.button !== 0) { - return; - } - - this.icon.active(true); + return this.active ? this.urls.active : this.urls.inactive; } - click(e, name) { + click(e) { if (e.button !== 0) { return; } - this.icon.active(true); this.$scope.iconClick(); - this.icon.active(false); - this.icon.hovered(false); + this.active = false; + + e.stopPropagation(); } } IconCtrl.$inject = ['$scope']; - angular.module('openfin.icon') + angular.module('stockflux.icon') .controller('IconCtrl', IconCtrl); }()); diff --git a/src/icon/icon-directive.js b/src/icon/icon-directive.js index 3db4beebc..1ec9cdafa 100644 --- a/src/icon/icon-directive.js +++ b/src/icon/icon-directive.js @@ -1,7 +1,7 @@ (function() { 'use strict'; - angular.module('openfin.icon') + angular.module('stockflux.icon') .directive('icon', [() => { return { restrict: 'E', diff --git a/src/icon/icon.html b/src/icon/icon.html index d4076d6d9..c614a1416 100644 --- a/src/icon/icon.html +++ b/src/icon/icon.html @@ -1,2 +1,2 @@ - + diff --git a/src/index.html b/src/index.html index 153db5d7d..bc8a1f71d 100644 --- a/src/index.html +++ b/src/index.html @@ -1,10 +1,10 @@  - + - OpenFin D3FC + StockFlux diff --git a/src/main/main-controller.js b/src/main/main-controller.js index 9e63e7d9e..e84191462 100644 --- a/src/main/main-controller.js +++ b/src/main/main-controller.js @@ -16,6 +16,6 @@ } MainCtrl.$inject = []; - angular.module('openfin.main') + angular.module('stockflux.main') .controller('MainCtrl', MainCtrl); }()); diff --git a/src/main/main-directive.js b/src/main/main-directive.js index 0b7562a16..94a3fb654 100644 --- a/src/main/main-directive.js +++ b/src/main/main-directive.js @@ -1,7 +1,7 @@ (function() { 'use strict'; - angular.module('openfin.main') + angular.module('stockflux.main') .directive('main', [() => { return { restrict: 'E', diff --git a/src/main/version/version-controller.js b/src/main/version/version-controller.js index a1f5df003..f42171d9f 100644 --- a/src/main/version/version-controller.js +++ b/src/main/version/version-controller.js @@ -1,7 +1,7 @@ (function() { 'use strict'; - const VERSION = { version: '9.0.0' }; + const VERSION = { version: '9.1.0' }; class VersionCtrl { constructor(currentWindowService) { @@ -18,6 +18,6 @@ } VersionCtrl.$inject = ['currentWindowService']; - angular.module('openfin.version') + angular.module('stockflux.version') .controller('VersionCtrl', VersionCtrl); }()); diff --git a/src/main/version/version-directive.js b/src/main/version/version-directive.js index c186206f4..63ec38a7f 100644 --- a/src/main/version/version-directive.js +++ b/src/main/version/version-directive.js @@ -1,7 +1,7 @@ (function() { 'use strict'; - angular.module('openfin.version') + angular.module('stockflux.version') .directive('version', [() => { return { restrict: 'E', diff --git a/src/parent-controller.js b/src/parent-controller.js index 257881fa9..364c914d4 100644 --- a/src/parent-controller.js +++ b/src/parent-controller.js @@ -34,6 +34,6 @@ } ParentCtrl.$inject = ['$scope', 'storeService', 'windowCreationService']; - angular.module('openfin.parent') + angular.module('stockflux.parent') .controller('ParentCtrl', ParentCtrl); }()); diff --git a/src/parent.html b/src/parent.html index ea32d438e..77bffc746 100644 --- a/src/parent.html +++ b/src/parent.html @@ -1,5 +1,5 @@  - + diff --git a/src/parentApp.js b/src/parentApp.js index 92c146c7d..dbaac97da 100644 --- a/src/parentApp.js +++ b/src/parentApp.js @@ -1,13 +1,13 @@ (function() { 'use strict'; - angular.module('OpenFinD3FCParent', [ - 'openfin.parent' + angular.module('StockFluxParent', [ + 'stockflux.parent' ]); - angular.module('openfin.parent', ['openfin.store', 'openfin.window']); - angular.module('openfin.store', []); - angular.module('openfin.currentWindow', []); - angular.module('openfin.window', ['openfin.store', 'openfin.geometry', 'openfin.config']); - angular.module('openfin.config', []); + angular.module('stockflux.parent', ['stockflux.store', 'stockflux.window']); + angular.module('stockflux.store', []); + angular.module('stockflux.currentWindow', []); + angular.module('stockflux.window', ['stockflux.store', 'stockflux.geometry', 'stockflux.config']); + angular.module('stockflux.config', []); }()); diff --git a/src/services/currentWindow-service.js b/src/services/currentWindow-service.js index ff9290e45..e8ecff796 100644 --- a/src/services/currentWindow-service.js +++ b/src/services/currentWindow-service.js @@ -5,7 +5,7 @@ * Abstraction layer for the OpenFin API. * Also catches events dispatched from the parent window. */ - angular.module('openfin.currentWindow') + angular.module('stockflux.currentWindow') .factory('currentWindowService', ['$rootScope', ($rootScope) => { function getCurrentWindow() { return fin.desktop.Window.getCurrent(); diff --git a/src/services/quandl-service.js b/src/services/quandl-service.js index 0d7d654cb..c7ee5d7ec 100644 --- a/src/services/quandl-service.js +++ b/src/services/quandl-service.js @@ -152,6 +152,6 @@ } QuandlService.$inject = ['$resource']; - angular.module('openfin.quandl', ['ngResource']) + angular.module('stockflux.quandl', ['ngResource']) .service('quandlService', QuandlService); }()); diff --git a/src/services/selection-service.js b/src/services/selection-service.js index e951331c5..fb6511f5f 100644 --- a/src/services/selection-service.js +++ b/src/services/selection-service.js @@ -29,6 +29,6 @@ } SelectionService.$inject = []; - angular.module('openfin.selection', []) + angular.module('stockflux.selection', []) .service('selectionService', SelectionService); }()); diff --git a/src/showcase/showcase-controller.js b/src/showcase/showcase-controller.js index 0bd6c685e..c143150f1 100644 --- a/src/showcase/showcase-controller.js +++ b/src/showcase/showcase-controller.js @@ -21,6 +21,6 @@ ShowcaseCtrl.$inject = ['selectionService']; // The quandl service is used in the directive. - angular.module('openfin.showcase', ['openfin.selection', 'openfin.quandl']) + angular.module('stockflux.showcase', ['stockflux.selection', 'stockflux.quandl']) .controller('ShowcaseCtrl', ShowcaseCtrl); }()); diff --git a/src/showcase/showcase-directive.js b/src/showcase/showcase-directive.js index b79695370..d988188b0 100644 --- a/src/showcase/showcase-directive.js +++ b/src/showcase/showcase-directive.js @@ -1,7 +1,7 @@ (function(bitflux) { 'use strict'; - angular.module('openfin.showcase') + angular.module('stockflux.showcase') .directive('showcase', ['quandlService', 'configService', (quandlService, configService) => { return { restrict: 'E', diff --git a/src/sidebars/favourites/favourite-controller.js b/src/sidebars/favourites/favourite-controller.js index 2c2928590..d67d6a032 100644 --- a/src/sidebars/favourites/favourite-controller.js +++ b/src/sidebars/favourites/favourite-controller.js @@ -160,6 +160,6 @@ } FavouritesCtrl.$inject = ['currentWindowService', 'quandlService', 'selectionService', '$scope', '$timeout']; - angular.module('openfin.favourites') + angular.module('stockflux.favourites') .controller('FavouritesCtrl', FavouritesCtrl); }()); diff --git a/src/sidebars/favourites/favourite-directive.js b/src/sidebars/favourites/favourite-directive.js index b5e8f4051..59306d0ef 100644 --- a/src/sidebars/favourites/favourite-directive.js +++ b/src/sidebars/favourites/favourite-directive.js @@ -1,7 +1,7 @@ (function() { 'use strict'; - angular.module('openfin.favourites') + angular.module('stockflux.favourites') .directive('favourite', [() => { return { restrict: 'E', diff --git a/src/sidebars/favourites/favourite.html b/src/sidebars/favourites/favourite.html index ca2ade011..abee88e27 100644 --- a/src/sidebars/favourites/favourite.html +++ b/src/sidebars/favourites/favourite.html @@ -3,8 +3,8 @@ ng-init="(selection() == null || selection() === '') && select(stock);">
-
- +
+
{{stock.name | truncate}}
{{stock.code | uppercase}}
diff --git a/src/sidebars/favourites/geometry-service.js b/src/sidebars/favourites/geometry-service.js index b95a5fa9d..5e5b3c6cb 100644 --- a/src/sidebars/favourites/geometry-service.js +++ b/src/sidebars/favourites/geometry-service.js @@ -92,6 +92,6 @@ } } - angular.module('openfin.geometry', []) + angular.module('stockflux.geometry', []) .service('geometryService', GeometryService); })(); diff --git a/src/sidebars/favourites/hover-service.js b/src/sidebars/favourites/hover-service.js index 2085ac208..6843fba7a 100644 --- a/src/sidebars/favourites/hover-service.js +++ b/src/sidebars/favourites/hover-service.js @@ -30,6 +30,6 @@ } } HoverService.$inject = ['$rootScope']; - angular.module('openfin.hover', []) + angular.module('stockflux.hover', []) .service('hoverService', HoverService); }()); diff --git a/src/sidebars/favourites/minichart/minichart-controller.js b/src/sidebars/favourites/minichart/minichart-controller.js index a203f02c5..3230eacf7 100644 --- a/src/sidebars/favourites/minichart/minichart-controller.js +++ b/src/sidebars/favourites/minichart/minichart-controller.js @@ -75,6 +75,6 @@ } MinichartCtrl.$inject = ['quandlService', '$timeout']; - angular.module('openfin.minichart', ['openfin.quandl']) + angular.module('stockflux.minichart', ['stockflux.quandl']) .controller('MinichartCtrl', MinichartCtrl); }()); diff --git a/src/sidebars/favourites/minichart/minichart-directive.js b/src/sidebars/favourites/minichart/minichart-directive.js index 5fb63a69e..e1e7d379d 100644 --- a/src/sidebars/favourites/minichart/minichart-directive.js +++ b/src/sidebars/favourites/minichart/minichart-directive.js @@ -1,7 +1,7 @@ (function() { 'use strict'; - angular.module('openfin.minichart') + angular.module('stockflux.minichart') .directive('minichart', [() => { return { restrict: 'E', diff --git a/src/sidebars/favourites/tearout-directive.js b/src/sidebars/favourites/tearout-directive.js index 98462eb7d..61740ad5c 100644 --- a/src/sidebars/favourites/tearout-directive.js +++ b/src/sidebars/favourites/tearout-directive.js @@ -1,7 +1,7 @@ (function(window) { 'use strict'; - angular.module('openfin.tearout') + angular.module('stockflux.tearout') .directive('tearable', ['geometryService', 'hoverService', 'currentWindowService', 'configService', (geometryService, hoverService, currentWindowService, configService) => { return { @@ -117,7 +117,7 @@ var compact = store.isCompact(); windowService.createMainWindow(null, compact, (newWindow) => { newWindow.resizeTo(window.outerWidth, window.outerHeight, 'top-left'); - var newCardOffset = configService.getTopCardOffset(); + var newCardOffset = configService.getTopCardOffset(compact); newWindow.moveTo(e.screenX - newCardOffset[0], e.screenY - newCardOffset[1]); var newStore = window.storeService.open(newWindow.name); newStore.add(scope.stock); diff --git a/src/sidebars/filters.js b/src/sidebars/filters.js index 17cf4e525..2e6fdf80c 100644 --- a/src/sidebars/filters.js +++ b/src/sidebars/filters.js @@ -1,7 +1,7 @@ (function() { 'use strict'; - angular.module('openfin.filters') + angular.module('stockflux.filters') .filter('truncate', () => { return (input) => { if (input) { diff --git a/src/sidebars/scrollbar-directive.js b/src/sidebars/scrollbar-directive.js index 23a65f828..499aa4779 100644 --- a/src/sidebars/scrollbar-directive.js +++ b/src/sidebars/scrollbar-directive.js @@ -1,7 +1,7 @@ (function() { 'use strict'; - angular.module('openfin.scroll') + angular.module('stockflux.scroll') .directive('customScrollbar', [() => { return { restrict: 'C', diff --git a/src/sidebars/search/search-controller.js b/src/sidebars/search/search-controller.js index a2073e8c3..b6b84d34f 100644 --- a/src/sidebars/search/search-controller.js +++ b/src/sidebars/search/search-controller.js @@ -157,6 +157,6 @@ } SearchCtrl.$inject = ['$scope', 'quandlService', 'selectionService', 'currentWindowService']; - angular.module('openfin.search') + angular.module('stockflux.search') .controller('SearchCtrl', SearchCtrl); }()); diff --git a/src/sidebars/search/search-directive.js b/src/sidebars/search/search-directive.js index 2cd792f7a..36324064c 100644 --- a/src/sidebars/search/search-directive.js +++ b/src/sidebars/search/search-directive.js @@ -1,7 +1,7 @@ (function() { 'use strict'; - angular.module('openfin.search') + angular.module('stockflux.search') .directive('search', ['$timeout', ($timeout) => { return { restrict: 'E', diff --git a/src/sidebars/search/search.html b/src/sidebars/search/search.html index 7e5fb67aa..aa3a15222 100644 --- a/src/sidebars/search/search.html +++ b/src/sidebars/search/search.html @@ -1,6 +1,6 @@
- + @@ -13,9 +13,8 @@
{{stock.name | truncate}}
{{stock.code | uppercase}}
-
- +
+
diff --git a/src/sidebars/sidebar-controller.js b/src/sidebars/sidebar-controller.js index 31b620f5a..13f6553d7 100644 --- a/src/sidebars/sidebar-controller.js +++ b/src/sidebars/sidebar-controller.js @@ -54,6 +54,6 @@ } SidebarCtrl.$inject = []; - angular.module('openfin.sidebar') + angular.module('stockflux.sidebar') .controller('SidebarCtrl', SidebarCtrl); }()); diff --git a/src/sidebars/sidebar-directive.js b/src/sidebars/sidebar-directive.js index edf54d1d4..d88c23062 100644 --- a/src/sidebars/sidebar-directive.js +++ b/src/sidebars/sidebar-directive.js @@ -1,7 +1,7 @@ (function() { 'use strict'; - angular.module('openfin.sidebar') + angular.module('stockflux.sidebar') .directive('sideBar', [() => { return { restrict: 'E', diff --git a/src/sidebars/sidebar.html b/src/sidebars/sidebar.html index 7f9ed3c89..d8564f9a1 100644 --- a/src/sidebars/sidebar.html +++ b/src/sidebars/sidebar.html @@ -1,7 +1,7 @@
- +
diff --git a/src/sidebars/sidebar.less b/src/sidebars/sidebar.less index a6321f07a..1f59ef07a 100644 --- a/src/sidebars/sidebar.less +++ b/src/sidebars/sidebar.less @@ -64,6 +64,10 @@ .contracted { width: (@sidebar-width - @expanded-width); + + .sidetab-top { + -webkit-app-region: no-drag; + } } .favourites.contracted:hover, .search.contracted:hover { @@ -94,6 +98,7 @@ .sidetab-top { height: @toolbar-height; + -webkit-app-region: drag; } .darkens:hover { diff --git a/src/sidebars/star/star-controller.js b/src/sidebars/star/star-controller.js index 0d72759c1..d14383253 100644 --- a/src/sidebars/star/star-controller.js +++ b/src/sidebars/star/star-controller.js @@ -10,38 +10,39 @@ class StarCtrl { constructor($scope, selectionService) { - this.$scope = $scope; this.store = null; this.selectionService = selectionService; this.starHovered = false; - this.check = false; + + this.stock = $scope.stock; + this.check = this.stock.favourite; } - favouriteUrl(stock) { - if (stock.favourite) { + favouriteUrl() { + if (this.stock.favourite) { return starUrls.on; } else if (this.starHovered) { return starUrls.onHover; - } else if (stock.isHovered || this.selectionService.selectedStock() === stock) { + } else if (this.stock.isHovered || this.selectionService.selectedStock() === this.stock) { return starUrls.offHover; } else { return starUrls.off; } } - click(stock) { - if (!this.check || confirm('Are you sure you wish to remove this stock (' + stock.code + ') from your favourites?')) { + click() { + if (!this.check || confirm('Are you sure you wish to remove this stock (' + this.stock.code + ') from your favourites?')) { if (!this.store) { this.store = window.storeService.open(window.name); } - if (stock.favourite) { - stock.favourite = false; - this.store.remove(stock); + if (this.stock.favourite) { + this.stock.favourite = false; + this.store.remove(this.stock); } else { - stock.favourite = true; - this.store.add(stock); + this.stock.favourite = true; + this.store.add(this.stock); } } } @@ -56,6 +57,6 @@ } StarCtrl.$inject = ['$scope', 'selectionService']; - angular.module('openfin.star') + angular.module('stockflux.star') .controller('StarCtrl', StarCtrl); }()); diff --git a/src/sidebars/star/star-directive.js b/src/sidebars/star/star-directive.js index 115ef1c91..8d6570dd5 100644 --- a/src/sidebars/star/star-directive.js +++ b/src/sidebars/star/star-directive.js @@ -1,17 +1,16 @@ (function() { 'use strict'; - angular.module('openfin.star') + angular.module('stockflux.star') .directive('star', [() => { return { restrict: 'E', templateUrl: 'sidebars/star/star.html', scope: { - starClick: '&', - favouriteUrl: '&', - mouseLeave: '&', - mouseEnter: '&' - } + stock: '=' + }, + controller: 'StarCtrl', + controllerAs: 'starCtrl' }; }]); }()); diff --git a/src/sidebars/star/star.html b/src/sidebars/star/star.html index 4ecf34c51..51a30c62f 100644 --- a/src/sidebars/star/star.html +++ b/src/sidebars/star/star.html @@ -1,2 +1,2 @@ - \ No newline at end of file + diff --git a/src/store-service.js b/src/store-service.js index 67505ceee..db8260e7c 100644 --- a/src/store-service.js +++ b/src/store-service.js @@ -162,6 +162,6 @@ } StoreService.$inject = ['$rootScope']; - angular.module('openfin.store') + angular.module('stockflux.store') .service('storeService', StoreService); }()); diff --git a/src/toolbar/toolbar-controller.js b/src/toolbar/toolbar-controller.js index 2450f4c71..d4054734c 100644 --- a/src/toolbar/toolbar-controller.js +++ b/src/toolbar/toolbar-controller.js @@ -15,11 +15,6 @@ this.window = null; this.maximised = false; this.oldSize = null; - currentWindowService.ready(() => { - var boundReady = this.onReady.bind(this); - boundReady(); - this._watch(); - }); this.maximisedEvent = () => { this.$timeout(() => { @@ -32,6 +27,12 @@ this.maximised = false; }); }; + + currentWindowService.ready(() => { + var boundReady = this.onReady.bind(this); + boundReady(); + this._watch(); + }); } isCompact() { @@ -109,6 +110,6 @@ } ToolbarCtrl.$inject = ['$scope', '$timeout', 'currentWindowService']; - angular.module('openfin.toolbar') + angular.module('stockflux.toolbar') .controller('ToolbarCtrl', ToolbarCtrl); }()); diff --git a/src/toolbar/toolbar-directive.js b/src/toolbar/toolbar-directive.js index dac5a9272..9648435de 100644 --- a/src/toolbar/toolbar-directive.js +++ b/src/toolbar/toolbar-directive.js @@ -1,7 +1,7 @@ (function() { 'use strict'; - angular.module('openfin.toolbar') + angular.module('stockflux.toolbar') .directive('toolbar', [() => { return { restrict: 'E', diff --git a/src/window-service.js b/src/window-service.js index cff8d3331..8de00bc8a 100644 --- a/src/window-service.js +++ b/src/window-service.js @@ -237,12 +237,6 @@ let availableRect = monitor.availableRect; - if (bounds.left < availableRect.left) { - bounds.left = availableRect.left; - } else if (bounds.left + bounds.width > availableRect.right) { - bounds.left = availableRect.right - bounds.width; - } - if (bounds.top < availableRect.top) { bounds.top = availableRect.top; } else if (bounds.top + bounds.height > availableRect.bottom) { @@ -300,6 +294,6 @@ } WindowCreationService.$inject = ['storeService', 'geometryService', '$q', 'configService']; - angular.module('openfin.window') + angular.module('stockflux.window') .service('windowCreationService', WindowCreationService); }(fin));