Make pause-on-exceptions toggle/tri-state button.

Source/devtools/front_end/SourcesPanel.js

 /*
  * Copyright (C) 2008 Apple Inc. All Rights Reserved.
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 196 matching lines @@
             return;
 
         event.returnValue = WebInspector.UIString("DevTools have unsaved changes that will be permanently lost.");
         WebInspector.showPanel("sources");
         for (var i = 0; i < unsavedSourceCodes.length; ++i)
             WebInspector.panels.sources.showUISourceCode(unsavedSourceCodes[i]);
     }
     window.addEventListener("beforeunload", handleBeforeUnload.bind(this), true);
 }
 
+/** @type {!Array.<!WebInspector.DebuggerModel.PauseOnExceptionsState>} */
+WebInspector.SourcesPanel.PauseOnExceptionsStates = [
+    WebInspector.DebuggerModel.PauseOnExceptionsState.DontPauseOnExceptions,
+    WebInspector.DebuggerModel.PauseOnExceptionsState.PauseOnAllExceptions,

[vsevik, 2013/12/27 09:22:34]

012 -> 021

[eustas, 2013/12/30 14:08:59]

Done.

+    WebInspector.DebuggerModel.PauseOnExceptionsState.PauseOnUncaughtExceptions
+];
+
 WebInspector.SourcesPanel.prototype = {
     defaultFocusedElement: function()
     {
         return this._editorContainer.view.defaultFocusedElement() || this._navigator.view.defaultFocusedElement();
     },
 
     get paused()
     {
         return this._paused;
     },
@@ skipping 486 matching lines @@
         if (sourceFrame && (!this._navigatorController.isNavigatorPinned() || event.data.focusSource))
             sourceFrame.focus();
     },
 
     _itemSearchStarted: function(event)
     {
         var searchText = /** @type {string} */ (event.data);
         WebInspector.OpenResourceDialog.show(this, this.editorView.mainElement(), searchText);
     },
 
+    /**
+     * @return {!Array.<!WebInspector.StatusBarButton>}
+     */
+    _createPauseOnExceptionOptions: function()
+    {
+        var excludedOption = this._pauseOnExceptionButtons[0].state;
+        var options = this._pauseOnExceptionButtons.slice(1);

[vsevik, 2013/12/27 09:22:34]

Let's create buttons here instead.

[eustas, 2013/12/30 14:08:59]

Done.

+        var pauseStates = WebInspector.SourcesPanel.PauseOnExceptionsStates.slice(0);
+        var j = 0;
+        for (var i = 0; i < pauseStates.length; ++i) {
+            if (pauseStates[i] !== excludedOption) {
+                options[j].state = pauseStates[i];
+                options[j].title = this._pauseOnExceptionStateTitle(pauseStates[i]);
+                j++;
+            }
+        }
+        return options;
+    },
+
     _pauseOnExceptionStateChanged: function()
     {
         var pauseOnExceptionsState = WebInspector.settings.pauseOnExceptionStateString.get();
-        switch (pauseOnExceptionsState) {
+        this._pauseOnExceptionButtons[0].title = this._pauseOnExceptionStateTitle(pauseOnExceptionsState);
+        this._pauseOnExceptionButtons[0].state = pauseOnExceptionsState;
+    },
+
+    /**
+     * @param {!WebInspector.DebuggerModel.PauseOnExceptionsState} state
+     * @return {string}
+     */
+    _pauseOnExceptionStateTitle: function(state)
+    {
+        switch (state) {
         case WebInspector.DebuggerModel.PauseOnExceptionsState.DontPauseOnExceptions:
-            this._pauseOnExceptionButton.title = WebInspector.UIString("Don't pause on exceptions.\nClick to Pause on all exceptions.");
-            break;
+            return WebInspector.UIString("Don't pause on exceptions.");
         case WebInspector.DebuggerModel.PauseOnExceptionsState.PauseOnAllExceptions:
-            this._pauseOnExceptionButton.title = WebInspector.UIString("Pause on all exceptions.\nClick to Pause on uncaught exceptions.");
-            break;
+            return WebInspector.UIString("Pause on all exceptions.");
         case WebInspector.DebuggerModel.PauseOnExceptionsState.PauseOnUncaughtExceptions:
-            this._pauseOnExceptionButton.title = WebInspector.UIString("Pause on uncaught exceptions.\nClick to Not pause on exceptions.");
-            break;
+            return WebInspector.UIString("Pause on uncaught exceptions.");
         }
-        this._pauseOnExceptionButton.state = pauseOnExceptionsState;
+        throw("Unexpected PauseOnExceptionsState: " + state);
     },
 
     _updateDebuggerButtons: function()
     {
         if (this._paused) {
             this._updateButtonTitle(this._pauseButton, WebInspector.UIString("Resume script execution (%s)."))
             this._pauseButton.state = true;
             this._pauseButton.setLongClickOptionsEnabled((function() { return [ this._longResumeButton ] }).bind(this));
 
             this._pauseButton.setEnabled(true);
@@ skipping 18 matching lines @@
         this.sidebarPanes.scopechain.update(null);
         this.sidebarPanes.jsBreakpoints.clearBreakpointHighlight();
         WebInspector.domBreakpointsSidebarPane.clearBreakpointHighlight();
         this.sidebarPanes.eventListenerBreakpoints.clearBreakpointHighlight();
         this.sidebarPanes.xhrBreakpoints.clearBreakpointHighlight();
 
         this._clearCurrentExecutionLine();
         this._updateDebuggerButtons();
     },
 
-    _togglePauseOnExceptions: function()
+    /**
+     * @param {!WebInspector.Event} e
+     */
+    _togglePauseOnExceptions: function(e)
     {
-        var nextStateMap = {};
+        var target = /** @type {!WebInspector.StatusBarButton} */ (e.target);
+        var state = /** @type {!WebInspector.DebuggerModel.PauseOnExceptionsState} */ (target.state);
+        var toggle = !e.data;
         var stateEnum = WebInspector.DebuggerModel.PauseOnExceptionsState;
-        nextStateMap[stateEnum.DontPauseOnExceptions] = stateEnum.PauseOnAllExceptions;
-        nextStateMap[stateEnum.PauseOnAllExceptions] = stateEnum.PauseOnUncaughtExceptions;
-        nextStateMap[stateEnum.PauseOnUncaughtExceptions] = stateEnum.DontPauseOnExceptions;
-        WebInspector.settings.pauseOnExceptionStateString.set(nextStateMap[this._pauseOnExceptionButton.state]);
+        if (toggle) {

[vsevik, 2013/12/27 09:22:34]

We should make different titles for each possible behavior after click.
I would expect that we have 3 titles like (<Current state>. Click to <Toggle
state>)
and 3 titles like (<Long click state>)

[eustas, 2013/12/30 14:08:59]

Done.

+            if (state !== stateEnum.DontPauseOnExceptions)
+                state = stateEnum.DontPauseOnExceptions
+            else
+                state = WebInspector.settings.lastPauseOnExceptionState.get();
+        }
+        if (state !== stateEnum.DontPauseOnExceptions)
+            WebInspector.settings.lastPauseOnExceptionState.set(state);
+        WebInspector.settings.pauseOnExceptionStateString.set(state);
     },
 
     /**
      * @return {boolean}
      */
     _runSnippet: function()
     {
         if (this._currentUISourceCode.project().type() !== WebInspector.projectTypes.Snippets)
             return false;
         WebInspector.scriptSnippetModel.evaluateScriptSnippet(this._currentUISourceCode);
@@ skipping 216 matching lines @@
         this._stepOutButton = this._createButtonAndRegisterShortcuts("scripts-step-out", title, handler, WebInspector.SourcesPanelDescriptor.ShortcutKeys.StepOut);
         debugToolbar.appendChild(this._stepOutButton.element);
 
         // Toggle Breakpoints
         this._toggleBreakpointsButton = new WebInspector.StatusBarButton(WebInspector.UIString("Deactivate breakpoints."), "scripts-toggle-breakpoints");
         this._toggleBreakpointsButton.toggled = false;
         this._toggleBreakpointsButton.addEventListener("click", this._toggleBreakpointsClicked, this);
         debugToolbar.appendChild(this._toggleBreakpointsButton.element);
 
         // Pause on Exception
-        this._pauseOnExceptionButton = new WebInspector.StatusBarButton("", "scripts-pause-on-exceptions-status-bar-item", 3);
-        this._pauseOnExceptionButton.addEventListener("click", this._togglePauseOnExceptions, this);
-        debugToolbar.appendChild(this._pauseOnExceptionButton.element);
+        var pauseStates = WebInspector.SourcesPanel.PauseOnExceptionsStates;
+        this._pauseOnExceptionButtons = [];
+        for (var i = 0; i < pauseStates.length; ++i) {
+            var button = new WebInspector.StatusBarButton("", "scripts-pause-on-exceptions-status-bar-item", 3);
+            button.addEventListener("click", this._togglePauseOnExceptions, this);
+            this._pauseOnExceptionButtons.push(button);
+        }
+        this._pauseOnExceptionButtons[0].setLongClickOptionsEnabled(this._createPauseOnExceptionOptions.bind(this));
+        debugToolbar.appendChild(this._pauseOnExceptionButtons[0].element);
 
         return debugToolbar;
     },
 
     /**
      * @param {!WebInspector.StatusBarButton} button
      * @param {string} buttonTitle
      */
     _updateButtonTitle: function(button, buttonTitle)
     {
@@ skipping 688 matching lines @@
 WebInspector.DrawerEditorView = function()
 {
     WebInspector.View.call(this);
     this.element.id = "drawer-editor-view";
     this.element.classList.add("vbox");
 }
 
 WebInspector.DrawerEditorView.prototype = {
     __proto__: WebInspector.View.prototype
 }