#9 Add confirmation when closing a group

Jakefile

@@ -17,14 +17,14 @@ task("cleanup", () => {
 
 desc("runs wslint on the built source");
 task("lint", ["build"], {async: true}, () => {
-  jake.exec([`cd ${DIST_DIR}; eslint .`], {
+  jake.exec([`cd ${DIST_DIR} & eslint .`], {
     interactive: true
   }, complete);
 });
 
 desc("Builds the source and starts a test installation. You can specify jpm parameters with 'JPM_PARAMS=\"...\" jake run'");
 task("run", ["build"], {async: true}, () => {
-  jake.exec([`cd ${DIST_DIR}; jpm run ${process.env.JPM_PARAMS}`], {
+  jake.exec([`cd ${DIST_DIR} & jpm run ${process.env.JPM_PARAMS}`], {
     interactive: true
   }, complete);
 });

src/data/action_creators.js

@@ -5,6 +5,7 @@ const ActionCreators = {
       tabgroups: tabgroups
     };
   },
+
   setGroupCloseTimeout: function(timeout) {
     return {
       type: "GROUP_CLOSE_TIMEOUT_RECIEVE",

src/data/assets/css/groupspanel.css

@@ -125,7 +125,7 @@ ul, li {
   }
 
   .group.closing .group-title {
-    color: #CCC;
+    color: #ccc;
     text-decoration: line-through;
   }
 

src/data/components/group.js

@@ -14,7 +14,6 @@ const Group = React.createClass({
 
   getInitialState: function() {
     return {
-      closeTimer: this.props.closeTimeout,
       closing: false,
       editing: false,
       expanded: false,
@@ -82,7 +81,6 @@ const Group = React.createClass({
           React.createElement(
             GroupControls,
             {
-              closeTimer: this.state.closeTimer,
               closing: this.state.closing,
               editing: this.state.editing,
               expanded: this.state.expanded,
@@ -113,7 +111,6 @@ const Group = React.createClass({
     event.stopPropagation();
     this.setState({editing: false});
     this.setState({closing: true});
-    this.setState({closeTimer: this.props.closeTimeout});
 
     let group = this;
 
@@ -122,13 +119,9 @@ const Group = React.createClass({
       return;
     }
 
-    let timer = setInterval(function() {
-      group.setState({closeTimer: --group.state.closeTimer});
-      if (group.state.closeTimer <= 0) {
-        group.props.onGroupCloseClick(group.props.group.id);
-        clearInterval(timer);
-      }
-    }, 1000);
+    setTimeout(function() {
+      group.props.onGroupCloseClick(group.props.group.id);
+    }, this.props.closeTimeout * 1000);
   },
 
   handleGroupClick: function(event) {
@@ -214,6 +207,5 @@ const Group = React.createClass({
     event.stopPropagation();
 
     this.setState({closing: false});
-    this.setState({closeTimer: this.props.closeTimeout});
   }
 });

src/data/components/groupcontrols.js

@@ -1,6 +1,5 @@
 const GroupControls = React.createClass({
   propTypes: {
-    closeTimer: React.PropTypes.number,
     expanded: React.PropTypes.bool.isRequired,
     onClose: React.PropTypes.func,
     onEdit: React.PropTypes.func,
@@ -35,10 +34,6 @@ const GroupControls = React.createClass({
 
   getClosingControls: function() {
     return [
-      React.DOM.span(
-        {className: "group-close-undo-timer"},
-        this.props.closeTimer
-      ),
       React.DOM.i({
         className: "group-close-undo fa fa-fw fa-undo",
         onClick: this.props.onUndoCloseClick

src/index.js

@@ -241,21 +241,6 @@ TabGroups.prototype = {
   },
 
   onGroupClose: function(event) {
-    let groupTabCount = this._tabs.getGroupTabCount(
-      this._getTabBrowser(),
-      event.groupID
-    );
-
-    if (groupTabCount > 0) {
-      let closeGroupConfirmed = this._closeGroupConfirmation();
-
-      this._groupsPanel.show({position: this._panelButton});
-
-      if (!closeGroupConfirmed) {
-        return;
-      }
-    }
-
     this._tabs.closeGroup(
       this._getWindow(),
       this._getTabBrowser(),
@@ -308,13 +293,6 @@ TabGroups.prototype = {
 
   _getTabBrowser: function() {
     return TabsUtils.getTabBrowser(this._getWindow());
-  },
-
-  _closeGroupConfirmation: function() {
-    let promptTitle = _("close_group_prompt_title");
-    let promptMessage = _("close_group_prompt_message");
-
-    return Utils.confirm(promptTitle, promptMessage);
   }
 };
 

src/locale/en-US.properties

@@ -1,11 +1,9 @@
 bindPanoramaShortcut_title = Listen to Ctrl/Cmd-Shift-E
 enableAlphabeticSort_title = Enable alphabetic sorting
-groupUndoCloseTimeout_title = Closing group timeout
-groupUndoCloseTimeout_description = Delay before close group in seconds
+groupUndoCloseTimeout_title = Closing group delay
+groupUndoCloseTimeout_description = Delay in seconds to wait before the group gets actually closed.
 
 add_group = Create new group
-close_group_prompt_title = Close group
-close_group_prompt_message = Do you want to close this group?
 panelButton_label = Group Tabs
 unnamed_group = Unnamed Group
 close_group_prompt_title = Close group

src/package.json

@@ -32,9 +32,10 @@
     },
     {
       "name": "groupCloseTimeout",
-      "title": "Closing group timeout",
+      "title": "Closing group delay",
+      "description": "Delay in seconds to wait before the group gets actually closed.",
       "type": "integer",
-      "value": 0
+      "value": 3
     }
   ]
 }