Merge pull request #549 from ScottLogic/dev

Merge dev to master v9.2.0

Author: WPFerg

README.md

@@ -46,6 +46,12 @@ grunt serve
 
 The project is also accessible at http://localhost:5000
 
+#### Releasing
+
+To release, run the Grunt task: `grunt release` for a major release, or `grunt bump:minor`
+for a minor. This updates all the version references to a new version. Then, submit a PR
+with this new version in to `dev`, and then merge it to `master`. Finally, run
+`grunt deploy:upstream` or `grunt deploy`, depending on how your remotes are set up.
 
 ## License
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bitflux-openfin",
-  "version": "9.1.0",
+  "version": "9.2.0",
   "scripts": {
     "test": "grunt ci",
     "postinstall": "cd node_modules/BitFlux && npm i"

src/closedWindows/closedWindowList/closedWindowList.html

@@ -1,5 +1,5 @@
 <div class="favourite-closed">
-    <icon name="{{icon}}" icon-click="closedWindowListCtrl.click(); $event.stopPropagation();"></icon>
+    <icon name="{{icon}}" icon-click="closedWindowListCtrl.click(); $event.stopPropagation();" tooltip="Last Closed Windows"></icon>
 </div>
 <div ng-show="closedWindowListCtrl.closedTabsShow" class="favourite-closed-cover" ng-click="closedWindowListCtrl.closedTabsShow = false">
     <div class="bubble-head"></div>

src/config-service.js

@@ -35,7 +35,14 @@
                 maxHeight: RESIZE_NO_LIMIT,
                 defaultWidth: 1280,
                 defaultHeight: 720,
-                shadow: true
+                shadow: true,
+                resizeRegion: {
+                    size: 7,
+                    topLeftCorner: 14,
+                    topRightCorner: 14,
+                    bottomRightCorner: 14,
+                    bottomLeftCorner: 14
+                }
             };
         }
 

src/icon/icon-directive.js

@@ -8,7 +8,8 @@
                 templateUrl: 'icon/icon.html',
                 scope: {
                     name: '@',
-                    iconClick: '&'
+                    iconClick: '&',
+                    tooltip: '@'
                 },
                 controller: 'IconCtrl',
                 controllerAs: 'iconCtrl'

src/icon/icon.html

@@ -1,2 +1,2 @@
 <img class="{{name + '-button'}}" ng-src="assets/png/{{iconCtrl.url()}}.png" ng-click="iconCtrl.click($event);" 
-     ng-mouseenter="iconCtrl.enter()" ng-mouseleave="iconCtrl.leave()" draggable="false"/>
+     ng-mouseenter="iconCtrl.enter()" ng-mouseleave="iconCtrl.leave()" title="{{tooltip}}" draggable="false"/>

src/main/version/version-controller.js

@@ -1,7 +1,7 @@
 (function() {
     'use strict';
 
-    const VERSION = { version: '9.1.0' };
+    const VERSION = { version: '9.2.0' };
 
     class VersionCtrl {
         constructor(currentWindowService) {

src/sidebars/favourites/favourite.html

@@ -2,9 +2,9 @@
     <div class="favourite darkens{{selection() !== stock.code ? '' : ' dark'}}" ng-click="singleClick(stock)" ng-dblclick="doubleClick(stock)" draggable="false"
          ng-init="(selection() == null || selection() === '') && select(stock);">
         <div class="top">
-            <img class="tearable {{single()}}" src="assets/png/drag_handle.png" draggable="false" />
+            <img class="tearable {{single()}}" src="assets/png/drag_handle.png" title="Move Stock" draggable="false" />
             <div class="star">
-                <star stock="stock"></star>
+                <star stock="stock" confirm="true"></star>
             </div>
             <div class="stock-name name">{{stock.name | truncate}}</div>
             <div class="code">{{stock.code | uppercase}}</div>

src/sidebars/favourites/tearout-directive.js

@@ -121,6 +121,7 @@
                                                 newWindow.moveTo(e.screenX - newCardOffset[0], e.screenY - newCardOffset[1]);
                                                 var newStore = window.storeService.open(newWindow.name);
                                                 newStore.add(scope.stock);
+                                                store.remove(scope.stock);
                                                 newStore.toggleCompact(compact);
                                             });
                                         }

src/sidebars/search/search-controller.js

@@ -154,6 +154,10 @@
                 }
             });
         }
+
+        darkenClass(stock) {
+            return (this.selection() === stock.code || stock.isHovered) ? 'dark' : '';
+        }
     }
     SearchCtrl.$inject = ['$scope', 'quandlService', 'selectionService', 'currentWindowService'];