Merge pull request #611 from ScottLogic/dev

Release 10.0.0-rc.0

Author: WPFerg

gruntfile.js

@@ -178,7 +178,7 @@ module.exports = function(grunt) {
             parent: {
                 src: ['src/parentApp.js', 'src/parent-controller.js', 'src/store-service.js',
                     'src/window-service.js', 'src/sidebars/favourites/geometry-service.js',
-                    'src/config-service.js'],
+                    'src/config-service.js', 'src/version-value.js'],
                 dest: 'public/app-parent.js'
             }
         },
@@ -203,14 +203,13 @@ module.exports = function(grunt) {
         },
         bump: {
             options: {
-                files: ['package.json', 'src/main/version/version-controller.js'],
+                files: ['package.json', 'src/version-value.js'],
                 commit: true,
-                commitMessage: 'Release v%VERSION%',
-                commitFiles: ['package.json', 'src/main/version/version-controller.js'],
-                createTag: true,
-                tagName: 'v%VERSION%',
-                tagMessage: 'Version %VERSION%',
-                push: false
+                commitMessage: 'Release %VERSION%',
+                commitFiles: ['package.json', 'src/version-value.js'],
+                createTag: false,
+                push: false,
+                prereleaseName: 'rc'
             }
         },
 

package.json

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

src/assets/png/closed_tabs.png

@@ -1,7 +1,8 @@
-.side-scroll {
-  top: 52px;
-  bottom: 0;
+.compact .side-scroll {
   position: fixed;
+}
+
+.side-scroll {
   padding-bottom: 30px;
   padding-bottom: 0px;
 
@@ -12,7 +13,9 @@
   }
 
   &#favourite-scroll {
-    bottom: 40px;
+    top: @toolbar-height;
+    bottom: @bottom-tab-height;
+    position: absolute;
   }
 }
 

src/assets/png/closed_tabs_active.png

@@ -12,6 +12,18 @@
   top: (7px + @additional-offset);
 }
 
+.transition(@duration: 0.2s, @delay: 0.1s) {
+  transition: all @duration linear @delay;
+}
+
+.drag {
+  -webkit-app-region: drag;
+}
+
+.no-drag {
+  -webkit-app-region: no-drag;
+}
+
 // 400 is 'normal'
 .font(@size, @weight: 400, @line-height: 1.5) {
   font-size: @size;
@@ -41,8 +53,12 @@
   right: @right;
 }
 
+.box-shadow(@shadow-position, @colour) {
+  box-shadow: @shadow-position 2px 0px @colour;
+}
+
 .closed-window(@shadow-position, @top: auto, @bottom: auto, @left: auto, @right: auto) {
-  box-shadow: @shadow-position 2px 0px @dark-background;
+  .box-shadow(@shadow-position, @dark-background);
   background: @light-background;
   position: fixed;
   width: 180px;

src/assets/png/drag_handle.png

@@ -19,6 +19,7 @@
 // Compact styles
 @import "../../main/main-compact.less";
 @import "../../toolbar/toolbar-compact.less";
+@import "../../sidebars/favourites/favourite-compact.less";
 @import "../../sidebars/sidebar-compact.less";
 @import "../../sidebars/search/search-compact.less";
 @import "../../closedWindows/closedWindowList/closedWindowList-compact.less";
@@ -45,6 +46,18 @@ body {
   right: -2px;
 }
 
+.disable-transitions {
+  * {
+    transition: none !important;
+  }
+}
+
+.disable-pointer {
+  * {
+    pointer-events: none;
+  }
+}
+
 #showcase-title {
   color: @chart-teal;
   position: absolute;

src/assets/styles/custom-scroll.less

@@ -13,9 +13,6 @@
 @search-background: @light-background;
 @favourites-background: @middle-background;
 
-// Transition
-@transition: all 0.2s linear 0.1s;
-
 // Dimensions
 @sidebar-width: 280px;
 @expanded-width: 230px;

src/assets/styles/mixins.less

@@ -2,21 +2,66 @@
     'use strict';
 
     class ClosedWindowListCtrl {
-        constructor() {
+        constructor($scope, $timeout) {
+            this.$scope = $scope;
+            this.$timeout = $timeout;
             this.closedWindows = [];
             this.closedTabsShow = false;
+            this.overriddenIcon = '';
+
+            this._watch();
+        }
+
+        override() {
+            return this.overriddenIcon;
         }
 
         refreshClosedWindows() {
             this.closedWindows = window.storeService.getPreviousClosedWindows();
+            this.updateSeen();
+        }
+
+        updateSeen() {
+            var seen = window.windowService.getClosedWindowSeen();
+            this.overriddenIcon = seen ? '' : (this.$scope.icon + '_active');
+
+            if (!seen && this.closedTabsShow && document.hasFocus()) {
+                window.windowService.seenClosedWindows();
+            }
         }
 
         click() {
+            this.overriddenIcon = '';
             this.refreshClosedWindows();
             this.closedTabsShow = this.closedWindows.length > 0;
+
+            if (window.windowService) {
+                window.windowService.seenClosedWindows();
+            }
+        }
+
+        _watch() {
+            var listener = () => this.$timeout(() => this.refreshClosedWindows());
+            var addListener = () => {
+                window.windowService.addClosedWindowListener(listener);
+                this.refreshClosedWindows();
+            };
+
+            // Can't guarantee that windowService exists, so if it doesn't, watch.
+            if (window.windowService) {
+                addListener();
+            } else {
+                this.$scope.$watch(() => window.windowService, () => {
+                    addListener();
+                });
+            }
+
+            this.$scope.$on('$destroy', () => {
+                window.windowService.removeClosedWindowListener(listener);
+            });
         }
     }
-    ClosedWindowListCtrl.$inject = [];
+    ClosedWindowListCtrl.$inject = ['$scope', '$timeout'];
 
     angular.module('stockflux.closedWindows')
         .controller('ClosedWindowListCtrl', ClosedWindowListCtrl);