Fix the 'bustage' of browser_parsable_script.js coming from bug 1067954 by whitelisting controller.js. It broke due to bug 1015578 (see mak's comment 2 there). CLOSED TREE

This commit is contained in:
Asaf Romano 2014-09-19 18:23:20 +03:00
parent d7618a51ff
commit 035e375f48
2 changed files with 3 additions and 3 deletions

View File

@ -7,6 +7,7 @@
*/
const kWhitelist = new Set([
/defaults\/profile\/prefs.js$/,
/browser\/content\/browser\/places\/controller.js$/,
]);

View File

@ -1249,8 +1249,7 @@ PlacesController.prototype = {
/**
* Paste Bookmarks and Folders from the clipboard
*/
paste: Task.async(function *() {
paste: Task.async(function* () {
// No reason to proceed if there isn't a valid insertion point.
let ip = this._view.insertionPoint;
if (!ip)
@ -1291,7 +1290,7 @@ PlacesController.prototype = {
PlacesTransactions.Tag({ uris: uris, tag: ip.tagName }));
}
else {
yield PlacesTransactions.transact(function *() {
yield PlacesTransactions.transact(function* () {
let insertionIndex = ip.index;
let parent = yield ip.promiseGuid();