Bug 538700 - Add preferences to control form fill assistant behavior [r=mark.finkle]

mobile/app/mobile.js

@@ -134,6 +134,11 @@ pref("signon.rememberSignons", true);
 pref("signon.expireMasterPassword", false);
 pref("signon.SignonFileName", "signons.txt");
 
+/* form helper */
+pref("formhelper.enabled", true);
+pref("formhelper.autozoom", true);
+pref("formhelper.restore", false);
+
 /* autocomplete */
 pref("browser.formfill.enable", true);
 

mobile/chrome/content/browser-ui.js

@@ -1346,7 +1346,7 @@ var FormHelper = {
   },
 
   _isValidSelectElement: function(aElement) {
-    return (aElement instanceof HTMLSelectElement) || (aElement instanceof Ci.nsIDOMXULMenuListElement);
+    return SelectHelper.canShowUIFor(aElement);
   },
 
   _isElementVisible: function(aElement) {
@@ -1491,6 +1491,9 @@ var FormHelper = {
       return false;
 
     this._open = true;
+    this._restore ={  zoom: Browser._browserView.getZoomLevel(),
+                      scroll: Browser.getScrollboxPosition(Browser.contentScrollboxScroller)
+                    };
     window.addEventListener("keyup", this, false);
     let bv = Browser._browserView;
     bv.ignorePageScroll(true);
@@ -1500,6 +1503,11 @@ var FormHelper = {
 
     this._nodes = this._getAll();
     this.setCurrentElement(aElement);
+
+    let evt = document.createEvent("UIEvents");
+    evt.initUIEvent("FormUI", true, true, window, this._open);
+    this._container.dispatchEvent(evt);
+
     return true;
   },
 
@@ -1522,7 +1530,19 @@ var FormHelper = {
     window.removeEventListener("keyup", this, false);
     this._container.hidden = true;
     this._currentElement = null;
+
+    if (gPrefService.getBoolPref("formhelper.restore") && this._restore) {
+      bv.setZoomLevel(this._restore.zoom);
+      Browser.contentScrollboxScroller.scrollTo(this._restore.scroll.x, this._restore.scroll.y);
+      bv.onAfterVisibleMove();
+      this._restore = null;
+    }
+
     this._open = false;
+
+    let evt = document.createEvent("UIEvents");
+    evt.initUIEvent("FormUI", true, true, window, this._open);
+    this._container.dispatchEvent(evt);
   },
 
   handleEvent: function formHelperHandleEvent(aEvent) {
@@ -1584,8 +1604,11 @@ var FormHelper = {
   },
 
   zoom: function formHelperZoom(aElement) {
-    let zoomLevel = Browser._getZoomLevelForElement(aElement);
-    zoomLevel = Math.min(Math.max(kBrowserFormZoomLevelMin, zoomLevel), kBrowserFormZoomLevelMax);
+    let zoomLevel = Browser._browserView.getZoomLevel();
+    if (gPrefService.getBoolPref("formhelper.autozoom")) {
+      zoomLevel = Browser._getZoomLevelForElement(aElement);
+      zoomLevel = Math.min(Math.max(kBrowserFormZoomLevelMin, zoomLevel), kBrowserFormZoomLevelMax);
+    }
 
     let elRect = this._getRectForElement(aElement);
     let zoomRect = Browser._getZoomRectForPoint(elRect.center().x, elRect.y, zoomLevel);
@@ -1804,6 +1827,14 @@ var SelectHelper = {
       this._control.fireOnChange();
   },
 
+
+  _isValidElement: function(aElement) {
+    if (!aElement || aElement.disabled)
+      return false;
+
+    return (aElement instanceof HTMLSelectElement) || (aElement instanceof Ci.nsIDOMXULMenuListElement);
+  },
+
   reset: function() {
     this._updateControl();
     let empty = this._list.cloneNode(false);
@@ -1818,6 +1849,10 @@ var SelectHelper = {
     this.reset();
   },
 
+  canShowUIFor: function(aElement) {
+    return this._isValidElement(aElement);
+  },
+
   unselectAll: function() {
     this._forEachOption(function(aItem, aIndex) aItem.selected = false);
   },

mobile/chrome/content/browser.js

@@ -1874,8 +1874,14 @@ ContentCustomClicker.prototype = {
         if (element instanceof HTMLOptionElement)
           element = element.parentNode;
 
-        if (FormHelper.canShowUIFor(element) && FormHelper.open(element))
+        if (gPrefService.getBoolPref("formhelper.enabled")) {
+          if (FormHelper.canShowUIFor(element) && FormHelper.open(element))
+            return;
+        }
+        else if (SelectHelper.canShowUIFor(element)) {
+          SelectHelper.show(element);
           return;
+        }
 
         this._dispatchMouseEvent("mousedown", cX, cY);
         this._dispatchMouseEvent("mouseup", cX, cY);