Bug 340432 - Add the ability to cancel site permission changes

application/palemoon/components/preferences/jar.mn

@@ -28,7 +28,7 @@ browser.jar:
     content/browser/preferences/languages.js
 *   content/browser/preferences/main.xul
     content/browser/preferences/main.js
-*   content/browser/preferences/permissions.xul
+    content/browser/preferences/permissions.xul
 *   content/browser/preferences/permissions.js
 *   content/browser/preferences/preferences.xul
     content/browser/preferences/privacy.xul

application/palemoon/components/preferences/permissions.js

@@ -3,6 +3,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+Components.utils.import("resource://gre/modules/Services.jsm");
+
 const nsIPermissionManager = Components.interfaces.nsIPermissionManager;
 const nsICookiePermission = Components.interfaces.nsICookiePermission;
 
@@ -17,12 +19,13 @@ function Permission(host, rawHost, type, capability)
 }
 
 var gPermissionManager = {
-  _type         : "",
+  _type                 : "",
-  _permissions  : [],
+  _permissions          : [],
-  _pm           : Components.classes["@mozilla.org/permissionmanager;1"]
+  _permissionsToAdd     : new Map(),
-                            .getService(Components.interfaces.nsIPermissionManager),
+  _permissionsToDelete  : new Map(),
-  _bundle       : null,
+  _bundle               : null,
-  _tree         : null,
+  _tree                 : null,
+  _observerRemoved      : false,
 
   _view: {
     _rowCount: 0,
@@ -82,38 +85,42 @@ var gPermissionManager = {
     var textbox = document.getElementById("url");
     var host = textbox.value.replace(/^\s*([-\w]*:\/+)?/, ""); // trim any leading space and scheme
     try {
-      var ioService = Components.classes["@mozilla.org/network/io-service;1"]
+      var uri = Services.io.newURI("http://" + host, null, null);
-                                .getService(Components.interfaces.nsIIOService);
-      var uri = ioService.newURI("http://"+host, null, null);
       host = uri.host;
     } catch(ex) {
-      var promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
-                                    .getService(Components.interfaces.nsIPromptService);
       var message = this._bundle.getString("invalidURI");
       var title = this._bundle.getString("invalidURITitle");
-      promptService.alert(window, title, message);
+      Services.prompt.alert(window, title, message);
       return;
     }
 
     var capabilityString = this._getCapabilityString(aCapability);
 
     // check whether the permission already exists, if not, add it
-    var exists = false;
+    let hostExists = false;
+    let capabilityExists = false;
     for (var i = 0; i < this._permissions.length; ++i) {
       if (this._permissions[i].rawHost == host) {
-        // Avoid calling the permission manager if the capability settings are
+        hostExists = true;
-        // the same. Otherwise allow the call to the permissions manager to
+        capabilityExists = this._permissions[i].capability == capabilityString;
-        // update the listbox for us.
+        if (!capabilityExists) {
-        exists = this._permissions[i].capability == capabilityString;
+          this._permissions[i].capability = capabilityString;
+        }
         break;
       }
     }
     
-    if (!exists) {
+
-      host = (host.charAt(0) == ".") ? host.substring(1,host.length) : host;
+    let permissionParams = {host: host, type: this._type, capability: aCapability};
-      var uri = ioService.newURI("http://" + host, null, null);
+    if (!hostExists) {
-      this._pm.add(uri, this._type, aCapability);
+      this._permissionsToAdd.set(host, permissionParams);
+      this._addPermission(permissionParams);
     }
+    else if (!capabilityExists) {
+        this._permissionsToAdd.set(host, permissionParams);
+        this._handleCapabilityChange();
+    }
+
     textbox.value = "";
     textbox.focus();
 
@@ -124,6 +131,50 @@ var gPermissionManager = {
     document.getElementById("removeAllPermissions").disabled = this._permissions.length == 0;
   },
 
+  _removePermission: function(aPermission)
+  {
+    this._removePermissionFromList(aPermission.host);
+
+    // If this permission was added during this session, let's remove
+    // it from the pending adds list to prevent calls to the
+    // permission manager.
+    let isNewPermission = this._permissionsToAdd.delete(aPermission.host);
+
+    if (!isNewPermission) {
+      this._permissionsToDelete.set(aPermission.host, aPermission);
+    }
+
+  },
+
+  _handleCapabilityChange: function ()
+  {
+    // Re-do the sort, if the status changed from Block to Allow
+    // or vice versa, since if we're sorted on status, we may no
+    // longer be in order.
+    if (this._lastPermissionSortColumn.id == "statusCol") {
+      this._resortPermissions();
+    }
+    this._tree.treeBoxObject.invalidate();
+  },
+
+  _addPermission: function(aPermission)
+  {
+    this._addPermissionToList(aPermission);
+    ++this._view._rowCount;
+    this._tree.treeBoxObject.rowCountChanged(this._view.rowCount - 1, 1);
+    // Re-do the sort, since we inserted this new item at the end.
+    this._resortPermissions();
+  },
+
+  _resortPermissions: function()
+  {
+    gTreeUtils.sort(this._tree, this._view, this._permissions,
+                    this._lastPermissionSortColumn,
+                    this._permissionsComparator,
+                    this._lastPermissionSortColumn, 
+                    !this._lastPermissionSortAscending); // keep sort direction        
+  },
+
   onHostInput: function (aSiteField)
   {
     document.getElementById("btnSession").disabled = !aSiteField.value;
@@ -184,8 +235,8 @@ var gPermissionManager = {
 
     var os = Components.classes["@mozilla.org/observer-service;1"]
                        .getService(Components.interfaces.nsIObserverService);
-    os.notifyObservers(null, NOTIFICATION_FLUSH_PERMISSIONS, this._type);
+    Services.obs.notifyObservers(null, NOTIFICATION_FLUSH_PERMISSIONS, this._type);
-    os.addObserver(this, "perm-changed", false);
+    Services.obs.addObserver(this, "perm-changed", false);
 
     this._loadPermissions();
 
@@ -194,9 +245,11 @@ var gPermissionManager = {
 
   uninit: function ()
   {
-    var os = Components.classes["@mozilla.org/observer-service;1"]
+    if (!this._observerRemoved) {
-                       .getService(Components.interfaces.nsIObserverService);
+      Services.obs.removeObserver(this, "perm-changed");
-    os.removeObserver(this, "perm-changed");
+
+      this._observerRemoved = true;
+    }
   },
 
   observe: function (aSubject, aTopic, aData)
@@ -209,15 +262,7 @@ var gPermissionManager = {
         return;
 
       if (aData == "added") {
-        this._addPermissionToList(permission);
+        this._addPermission(permission);
-        ++this._view._rowCount;
-        this._tree.treeBoxObject.rowCountChanged(this._view.rowCount - 1, 1);        
-        // Re-do the sort, since we inserted this new item at the end. 
-        gTreeUtils.sort(this._tree, this._view, this._permissions,
-                        this._lastPermissionSortColumn,
-                        this._permissionsComparator,
-                        this._lastPermissionSortColumn, 
-                        !this._lastPermissionSortAscending); // keep sort direction        
       }
       else if (aData == "changed") {
         for (var i = 0; i < this._permissions.length; ++i) {
@@ -226,28 +271,10 @@ var gPermissionManager = {
             break;
           }
         }
-        // Re-do the sort, if the status changed from Block to Allow
+        this._handleCapabilityChange();
-        // or vice versa, since if we're sorted on status, we may no
-        // longer be in order. 
-        if (this._lastPermissionSortColumn == "statusCol") {
-          gTreeUtils.sort(this._tree, this._view, this._permissions,
-                          this._lastPermissionSortColumn,
-                          this._permissionsComparator,
-                          this._lastPermissionSortColumn, 
-                          !this._lastPermissionSortAscending); // keep sort direction
-        }
-        this._tree.treeBoxObject.invalidate();
       }
       else if (aData == "deleted") {
-        for (var i = 0; i < this._permissions.length; i++) {
+        this._removePermissionFromList(permission);
-          if (this._permissions[i].host == permission.host) {
-            this._permissions.splice(i, 1);
-            this._view._rowCount--;
-            this._tree.treeBoxObject.rowCountChanged(this._view.rowCount - 1, -1);
-            this._tree.treeBoxObject.invalidate();
-            break;
-          }
-        }
       }
     }
   },
@@ -268,7 +295,7 @@ var gPermissionManager = {
     gTreeUtils.deleteSelectedItems(this._tree, this._view, this._permissions, removedPermissions);
     for (var i = 0; i < removedPermissions.length; ++i) {
       var p = removedPermissions[i];
-      this._pm.remove(p.host, p.type);
+      this._removePermission(p);
     }
     document.getElementById("removePermission").disabled = !this._permissions.length;
     document.getElementById("removeAllPermissions").disabled = !this._permissions.length;
@@ -282,7 +309,7 @@ var gPermissionManager = {
     gTreeUtils.deleteAll(this._tree, this._view, this._permissions, removedPermissions);
     for (var i = 0; i < removedPermissions.length; ++i) {
       var p = removedPermissions[i];
-      this._pm.remove(p.host, p.type);
+      this._removePermission(p);
     }
     document.getElementById("removePermission").disabled = true;
     document.getElementById("removeAllPermissions").disabled = true;
@@ -319,6 +346,25 @@ var gPermissionManager = {
     this._lastPermissionSortColumn = aColumn;
   },
 
+  onApplyChanges: function()
+  {
+    // Stop observing permission changes since we are about
+    // to write out the pending adds/deletes and don't need
+    // to update the UI
+    this.uninit();
+
+    for (let permissionParams of this._permissionsToAdd.values()) {
+      let uri = Services.io.newURI("http://" + permissionParams.host, null, null);
+      Services.perms.add(uri, permissionParams.type, permissionParams.capability);
+    }
+
+    for (let p of this._permissionsToDelete.values()) {
+      Services.perms.remove(p.host, p.type);
+    }
+
+    window.close();
+  },
+
   _loadPermissions: function ()
   {
     this._tree = document.getElementById("permissionsTree");
@@ -326,7 +372,7 @@ var gPermissionManager = {
 
     // load permissions into a table
     var count = 0;
-    var enumerator = this._pm.enumerator;
+    var enumerator = Services.perms.enumerator;
     while (enumerator.hasMoreElements()) {
       var nextPermission = enumerator.getNext().QueryInterface(Components.interfaces.nsIPermission);
       this._addPermissionToList(nextPermission);
@@ -364,6 +410,19 @@ var gPermissionManager = {
   }
 };
 
+  _removePermissionFromList: function (aHost)
+  {
+    for (let i = 0; i < this._permissions.length; ++i) {
+      if (this._permissions[i].host == aHost) {
+        this._permissions.splice(i, 1);
+        this._view._rowCount--;
+        this._tree.treeBoxObject.rowCountChanged(this._view.rowCount - 1, -1);
+        this._tree.treeBoxObject.invalidate();
+        break;
+      }
+    }
+  },
+
 function setHost(aHost)
 {
   gPermissionManager.setHost(aHost);

application/palemoon/components/preferences/permissions.xul

@@ -62,8 +62,8 @@
       <treechildren/>
     </tree>
   </vbox>
-  <hbox align="end">
+  <vbox>
-    <hbox class="actionButtons" flex="1">
+    <hbox class="actionButtons" align="left" flex="1">
       <button id="removePermission" disabled="true"
               accesskey="&removepermission.accesskey;"
               icon="remove" label="&removepermission.label;"
@@ -72,12 +72,14 @@
               icon="clear" label="&removeallpermissions.label;"
               accesskey="&removeallpermissions.accesskey;" 
               oncommand="gPermissionManager.onAllPermissionsDeleted();"/>
-      <spacer flex="1"/>
+    </hbox>
-#ifndef XP_MACOSX
+    <spacer flex="1"/>
+    <hbox class="actionButtons" align="right" flex="1">
       <button oncommand="close();" icon="close"
-              label="&button.close.label;" accesskey="&button.close.accesskey;"/>
+              label="&button.cancel.label;" accesskey="&button.cancel.accesskey;" />
-#endif
+      <button id="btnApplyChanges" oncommand="gPermissionManager.onApplyChanges();" icon="save"
+              label="&button.ok.label;" accesskey="&button.ok.accesskey;"/>
     </hbox>
     <resizer type="window" dir="bottomend"/>
-  </hbox>
+  </vbox>
 </window>

application/palemoon/locales/en-US/chrome/browser/preferences/permissions.dtd

@@ -3,7 +3,7 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY window.title                 "Exceptions">
-<!ENTITY window.width                 "36em">
+<!ENTITY window.width                 "45em">
 
 <!ENTITY treehead.sitename.label      "Site">
 <!ENTITY treehead.status.label        "Status">
@@ -21,6 +21,8 @@
 <!ENTITY allow.accesskey              "A">
 <!ENTITY windowClose.key              "w">
 
-<!ENTITY button.close.label           "Close">
+<!ENTITY button.cancel.label          "Cancel">
-<!ENTITY button.close.accesskey       "C">
+<!ENTITY button.cancel.accesskey      "C">
+<!ENTITY button.ok.label              "Save Changes">
+<!ENTITY button.ok.accesskey          "S">