Bug 1322622 - Rename the obsolete requestAutocomplete package out of the way of form autofill. r=steveck
MozReview-Commit-ID: 6jToAkI8DYe
--- a/toolkit/components/formautofill/content/RequestAutocompleteUI.jsm
+++ b/toolkit/components/formautofill/content/RequestAutocompleteUI.jsm
@@ -42,17 +42,17 @@ this.RequestAutocompleteUI.prototype = {
let args = {
resolveFn: resolveFn,
autofillData: this._autofillData,
};
args.wrappedJSObject = args;
// Open the window providing the function to call when it closes.
Services.ww.openWindow(null,
- "chrome://formautofill/content/requestAutocomplete.xhtml",
+ "chrome://requestautocomplete/content/requestAutocomplete.xhtml",
"Toolkit:RequestAutocomplete",
"chrome,dialog=no,resizable",
args);
// Wait for the window to be closed and the operation confirmed.
return yield uiPromise;
}),
};
--- a/toolkit/components/formautofill/content/requestAutocomplete.xhtml
+++ b/toolkit/components/formautofill/content/requestAutocomplete.xhtml
@@ -1,29 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- 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/. -->
<!DOCTYPE html [
<!ENTITY % htmlDTD PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd">
%htmlDTD;
- <!ENTITY % requestAutocompleteDTD SYSTEM "chrome://formautofill/locale/requestAutocomplete.dtd">
- %requestAutocompleteDTD;
<!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd" >
%globalDTD;
]>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>requestAutocomplete demo window</title>
<link rel="stylesheet"
href="chrome://mozapps/skin/formautofill/requestAutocomplete.css" />
<script type="application/javascript;version=1.7"
- src="chrome://formautofill/content/requestAutocomplete.js" />
+ src="chrome://requestautocomplete/content/requestAutocomplete.js" />
</head>
<body dir="&locale.dir;" onload="RequestAutocompleteDialog.onLoad();">
<h1>requestAutocomplete</h1>
<p>This is a demo window.</p>
<input id="accept" type="button" value="(OK)"
onclick="RequestAutocompleteDialog.onAccept();" />
<input id="cancel" type="button" value="(Cancel)"
onclick="RequestAutocompleteDialog.onCancel();" />
--- a/toolkit/components/formautofill/jar.mn
+++ b/toolkit/components/formautofill/jar.mn
@@ -1,8 +1,8 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# 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/.
toolkit.jar:
-% content formautofill %content/formautofill/
- content/formautofill/requestAutocomplete.js (content/requestAutocomplete.js)
- content/formautofill/requestAutocomplete.xhtml (content/requestAutocomplete.xhtml)
+% content requestautocomplete %content/requestautocomplete/
+ content/requestautocomplete/requestAutocomplete.js (content/requestAutocomplete.js)
+ content/requestautocomplete/requestAutocomplete.xhtml (content/requestAutocomplete.xhtml)
deleted file mode 100644
--- a/toolkit/locales/en-US/chrome/formautofill/requestAutocomplete.dtd
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
- - 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/. -->
-
-<!-- This file has no entities because the feature is still experimental. -->
--- a/toolkit/locales/jar.mn
+++ b/toolkit/locales/jar.mn
@@ -133,18 +133,16 @@
% locale alerts @AB_CD@ %locale/@AB_CD@/alerts/
locale/@AB_CD@/alerts/alert.dtd (%chrome/alerts/alert.dtd)
locale/@AB_CD@/alerts/alert.properties (%chrome/alerts/alert.properties)
#ifndef MOZ_FENNEC
% locale cookie @AB_CD@ %locale/@AB_CD@/cookie/
locale/@AB_CD@/cookie/cookieAcceptDialog.dtd (%chrome/cookie/cookieAcceptDialog.dtd)
locale/@AB_CD@/cookie/cookieAcceptDialog.properties (%chrome/cookie/cookieAcceptDialog.properties)
#endif
-% locale formautofill @AB_CD@ %locale/@AB_CD@/formautofill/
- locale/@AB_CD@/formautofill/requestAutocomplete.dtd (%chrome/formautofill/requestAutocomplete.dtd)
% locale passwordmgr @AB_CD@ %locale/@AB_CD@/passwordmgr/
locale/@AB_CD@/passwordmgr/passwordmgr.properties (%chrome/passwordmgr/passwordmgr.properties)
locale/@AB_CD@/passwordmgr/passwordManager.dtd (%chrome/passwordmgr/passwordManager.dtd)
% locale autoconfig @AB_CD@ %locale/@AB_CD@/autoconfig/
locale/@AB_CD@/autoconfig/autoconfig.properties (%chrome/autoconfig/autoconfig.properties)
% locale places @AB_CD@ %locale/@AB_CD@/places/
locale/@AB_CD@/places/places.properties (%chrome/places/places.properties)
locale/@AB_CD@/global/search/search.properties (%chrome/search/search.properties)
