Add skipWaiting checkbox to ServiceWorkersView in DevTools [2/2 blink]

Source/devtools/front_end/resources/ServiceWorkersView.js

 // Copyright (c) 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * @constructor
  * @extends {WebInspector.VBox}
  * @implements {WebInspector.TargetManager.Observer}
  */
 WebInspector.ServiceWorkersView = function()
@@ skipping 220 matching lines @@
     /**
      * @param {!WebInspector.ServiceWorkerRegistration} registration
      */
     _updateRegistration: function(registration)
     {
         var swRegistrationElement = this._registrationElements.get(registration.id);
         if (swRegistrationElement) {
             swRegistrationElement._updateRegistration(registration);
             return;
         }
-        swRegistrationElement = new WebInspector.SWRegistrationElement(this._manager, registration);
+        swRegistrationElement = new WebInspector.SWRegistrationElement(this._manager, this, registration);
         this._registrationElements.set(registration.id, swRegistrationElement);
         this._childrenListNode.appendChild(swRegistrationElement._element);
     },
 
     /**
      * @param {string} registrationId
      */
     _deleteRegistration: function(registrationId)
     {
         var swRegistrationElement = this._registrationElements.get(registrationId);
         if (!swRegistrationElement)
             return;
         this._registrationElements.delete(registrationId);
         this._childrenListNode.removeChild(swRegistrationElement._element);
-    }
+    },
+
+    /**
+     * @return {boolean}
+     */
+    _visible: function()
+    {
+        return !!this._element.parentElement;
+    },
 }
 
 /**
  * @constructor
  * @param {!WebInspector.ServiceWorkerManager} manager
+ * @param {!WebInspector.ServiceWorkerOriginElement} originElement
  * @param {!WebInspector.ServiceWorkerRegistration} registration
  */
-WebInspector.SWRegistrationElement = function(manager, registration)
+WebInspector.SWRegistrationElement = function(manager, originElement, registration)
 {
     this._manager = manager;
+    this._originElement = originElement;
     this._registration = registration;
     this._element = createElementWithClass("div", "service-workers-registration");
     var headerNode = this._element.createChild("li").createChild("div", "service-workers-registration-header");
     this._titleNode = headerNode.createChild("div", "service-workers-registration-title");
     this._deleteButton = headerNode.createChild("button", "service-workers-button service-workers-delete-button");
     this._deleteButton.addEventListener("click", this._deleteButtonClicked.bind(this), false);
     this._deleteButton.title = WebInspector.UIString("Delete");
     this._updateButton = headerNode.createChild("button", "service-workers-button service-workers-update-button");
     this._updateButton.addEventListener("click", this._updateButtonClicked.bind(this), false);
     this._updateButton.title = WebInspector.UIString("Update");
     this._updateButton.disabled = true
     this._pushButton = headerNode.createChild("button", "service-workers-button service-workers-push-button");
     this._pushButton.addEventListener("click", this._pushButtonClicked.bind(this), false);
     this._pushButton.title = WebInspector.UIString("Emulate push event");
     this._pushButton.disabled = true
     this._childrenListNode = this._element.createChild("ol");
+
+    this._skipWaitingCheckboxLabel = createCheckboxLabel(WebInspector.UIString("Skip waiting"));
+    this._skipWaitingCheckboxLabel.title = WebInspector.UIString("Simulate skipWaiting()");
+    this._skipWaitingCheckboxLabel.classList.add("service-workers-skip-waiting-checkbox-label");
+    this._skipWaitingCheckbox = this._skipWaitingCheckboxLabel.checkboxElement;
+    this._skipWaitingCheckbox.checked = true;
+    this._skipWaitingCheckbox.classList.add("service-workers-skip-waiting-checkbox");
+    this._skipWaitingCheckbox.addEventListener("change", this._skipWaitingCheckboxChanged.bind(this), false);
+
     this._updateRegistration(registration);
 }
 
 WebInspector.SWRegistrationElement.prototype = {
     /**
      * @param {!WebInspector.ServiceWorkerRegistration} registration
      */
     _updateRegistration: function(registration)
     {
         this._registration = registration;
         this._titleNode.textContent = WebInspector.UIString(registration.isDeleted ? "Scope: %s - deleted" : "Scope: %s", registration.scopeURL.asParsedURL().path);
         this._updateButton.disabled = !!registration.isDeleted;
         this._deleteButton.disabled = !!registration.isDeleted;
+        this._skipWaitingCheckboxLabel.remove();
         this._updateVersionList();
+        if (this._visible() && this._skipWaitingCheckbox.checked) {
+            this._registration.versions.valuesArray().map((function(version) {

[pfeldman, 2015/04/27 16:47:30]

This should be an annotated named function.

[horo, 2015/04/28 02:18:44]

Done.

+                    if (version.isInstalled())
+                        this._manager.skipWaiting(version.id);
+                }).bind(this));
+        }
     },
 
     _updateVersionList: function()
     {
         var fragment = createDocumentFragment();
         var tableElement = createElementWithClass("div", "service-workers-versions-table");
         var versions = this._registration.versions.valuesArray();
         versions = versions.filter(function(version) {
             return !version.isStoppedAndRedundant() || version.errorMessages.length;
         });
@@ skipping 22 matching lines @@
     },
 
     /**
      * @param {!Array.<!WebInspector.ServiceWorkerVersion>} versions
      * @param {string} modeClass
      * @param {string} modeTitle
      */
     _createVersionModeRow: function(versions, modeClass, modeTitle)
     {
         var modeRowElement = createElementWithClass("div", "service-workers-version-mode-row  service-workers-version-mode-row-" + modeClass);
-        modeRowElement.createChild("div", "service-workers-version-mode").createChild("div", "service-workers-version-mode-text").createTextChild(modeTitle);
+        var modeTitleDiv = modeRowElement.createChild("div", "service-workers-version-mode");
+        modeTitleDiv.createChild("div", "service-workers-version-mode-text").createTextChild(modeTitle);
+        if (modeClass == "waiting") {
+          modeTitleDiv.appendChild(this._skipWaitingCheckboxLabel);
+        }
         var versionsElement = modeRowElement.createChild("div", "service-workers-versions");
         for (var version of versions) {
             var stateRowElement = versionsElement.createChild("div", "service-workers-version-row");
             var statusDiv = stateRowElement.createChild("div", "service-workers-version-status");
             var icon = statusDiv.createChild("div", "service-workers-version-status-icon service-workers-color-" + (version.id % 10));
             icon.title = WebInspector.UIString("ID: %s", version.id);
             statusDiv.createChild("div", "service-workers-version-status-text").createTextChild(version.status);
             var runningStatusDiv = stateRowElement.createChild("div", "service-workers-version-running-status");
             if (version.isRunning() || version.isStarting()) {
                 var stopButton = runningStatusDiv.createChild("button", "service-workers-button service-workers-stop-button service-workers-version-running-status-button");
@@ skipping 91 matching lines @@
         this._manager.stopWorker(versionId);
     },
 
     /**
      * @param {string} versionId
      * @param {!Event} event
      */
     _inspectButtonClicked: function(versionId, event)
     {
         this._manager.inspectWorker(versionId);
-    }
+    },
+
+    _skipWaitingCheckboxChanged: function()
+    {
+        if (!this._skipWaitingCheckbox.checked)
+            return;
+        this._registration.versions.valuesArray().map((function(version) {

[pfeldman, 2015/04/27 16:47:30]

ditto

[horo, 2015/04/28 02:18:44]

Done.

+                if (version.isInstalled())
+                    this._manager.skipWaiting(version.id);
+            }).bind(this));
+    },
+
+    /**
+     * @return {boolean}
+     */
+    _visible: function()
+    {
+        return this._originElement._visible();
+    },
 }