Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Delta Between Two Patch Sets: background.js

Issue 8560083: adblockplusopera: Port UI code from Chrome (Closed)
Left Patch Set: Created Oct. 18, 2012, 1:07 p.m.
Right Patch Set: Created Oct. 19, 2012, 4:04 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « no previous file | button.js » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 var DownloadableSubscription = require("subscriptionClasses").DownloadableSubscr iption; 1 var DownloadableSubscription = require("subscriptionClasses").DownloadableSubscr iption;
2 var WhitelistFilter = require("filterClasses").WhitelistFilter; 2 var WhitelistFilter = require("filterClasses").WhitelistFilter;
3 var FilterNotifier = require("filterNotifier").FilterNotifier; 3 var FilterNotifier = require("filterNotifier").FilterNotifier;
4 var FilterStorage = require("filterStorage").FilterStorage; 4 var FilterStorage = require("filterStorage").FilterStorage;
5 var Prefs = require("prefs").Prefs; 5 var Prefs = require("prefs").Prefs;
6 var Synchronizer = require("synchronizer").Synchronizer; 6 var Synchronizer = require("synchronizer").Synchronizer;
7 var Subscription = require("subscriptionClasses").Subscription; 7 var Subscription = require("subscriptionClasses").Subscription;
8 var SpecialSubscription = require("subscriptionClasses").SpecialSubscription; 8 var SpecialSubscription = require("subscriptionClasses").SpecialSubscription;
9 var Utils = require("utils").Utils; 9 var Utils = require("utils").Utils;
10 10
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after
208 + (locale ? locale : "default")); 208 + (locale ? locale : "default"));
209 return; 209 return;
210 } 210 }
211 211
212 for (var i in messages) 212 for (var i in messages)
213 i18nMessages[i] = messages[i]; 213 i18nMessages[i] = messages[i];
214 } 214 }
215 215
216 function loadI18nMessages() 216 function loadI18nMessages()
217 { 217 {
218 i18nMessages = {};
219
220 // Could be parsed from config.xml 218 // Could be parsed from config.xml
221 var defaultLocale = "en"; 219 var defaultLocale = "en";
222 220
223 if (locale !== defaultLocale) 221 i18nMessages = {};
224 loadMessagesForLocale(defaultLocale); 222 loadMessagesForLocale(defaultLocale);
225
226 loadMessagesForLocale(); 223 loadMessagesForLocale();
227 } 224 }
228 225
229 setDefaultOptions(); 226 setDefaultOptions();
230 createToolbarButton(); 227 createToolbarButton();
231 refreshToolbarButton(); 228 refreshToolbarButton();
232 loadI18nMessages(); 229 loadI18nMessages();
LEFTRIGHT
« no previous file | button.js » ('j') | Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Toggle Comments ('s')

Powered by Google App Engine
This is Rietveld