Merge pull request #4508 from Snuffleupagus/extension-firefox-braces
Fix coding style in extensions/firefox
This commit is contained in:
commit
46f01600ef
9
extensions/firefox/bootstrap.js
vendored
9
extensions/firefox/bootstrap.js
vendored
@ -51,8 +51,9 @@ function setStringPref(pref, value) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function log(str) {
|
function log(str) {
|
||||||
if (!getBoolPref(EXT_PREFIX + '.pdfBugEnabled', false))
|
if (!getBoolPref(EXT_PREFIX + '.pdfBugEnabled', false)) {
|
||||||
return;
|
return;
|
||||||
|
}
|
||||||
dump(str + '\n');
|
dump(str + '\n');
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -101,8 +102,9 @@ Factory.prototype = {
|
|||||||
|
|
||||||
// nsIFactory
|
// nsIFactory
|
||||||
createInstance: function createInstance(aOuter, iid) {
|
createInstance: function createInstance(aOuter, iid) {
|
||||||
if (aOuter !== null)
|
if (aOuter !== null) {
|
||||||
throw Cr.NS_ERROR_NO_AGGREGATION;
|
throw Cr.NS_ERROR_NO_AGGREGATION;
|
||||||
|
}
|
||||||
return (new (this._targetConstructor)()).QueryInterface(iid);
|
return (new (this._targetConstructor)()).QueryInterface(iid);
|
||||||
},
|
},
|
||||||
|
|
||||||
@ -150,8 +152,9 @@ function startup(aData, aReason) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function shutdown(aData, aReason) {
|
function shutdown(aData, aReason) {
|
||||||
if (aReason == APP_SHUTDOWN)
|
if (aReason == APP_SHUTDOWN) {
|
||||||
return;
|
return;
|
||||||
|
}
|
||||||
var ioService = Services.io;
|
var ioService = Services.io;
|
||||||
var resProt = ioService.getProtocolHandler('resource')
|
var resProt = ioService.getProtocolHandler('resource')
|
||||||
.QueryInterface(Ci.nsIResProtocolHandler);
|
.QueryInterface(Ci.nsIResProtocolHandler);
|
||||||
|
@ -12,18 +12,19 @@
|
|||||||
function getL10nData(key) {
|
function getL10nData(key) {
|
||||||
var response = FirefoxCom.requestSync('getStrings', key);
|
var response = FirefoxCom.requestSync('getStrings', key);
|
||||||
var data = JSON.parse(response);
|
var data = JSON.parse(response);
|
||||||
if (!data)
|
if (!data) {
|
||||||
console.warn('[l10n] #' + key + ' missing for [' + gLanguage + ']');
|
console.warn('[l10n] #' + key + ' missing for [' + gLanguage + ']');
|
||||||
|
}
|
||||||
return data;
|
return data;
|
||||||
}
|
}
|
||||||
|
|
||||||
// replace {{arguments}} with their values
|
// replace {{arguments}} with their values
|
||||||
function substArguments(text, args) {
|
function substArguments(text, args) {
|
||||||
if (!args)
|
if (!args) {
|
||||||
return text;
|
return text;
|
||||||
|
}
|
||||||
return text.replace(/\{\{\s*(\w+)\s*\}\}/g, function(all, name) {
|
return text.replace(/\{\{\s*(\w+)\s*\}\}/g, function(all, name) {
|
||||||
return name in args ? args[name] : '{{' + name + '}}';
|
return (name in args ? args[name] : '{{' + name + '}}');
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -48,28 +49,33 @@
|
|||||||
|
|
||||||
// translate an HTML element
|
// translate an HTML element
|
||||||
function translateElement(element) {
|
function translateElement(element) {
|
||||||
if (!element || !element.dataset)
|
if (!element || !element.dataset) {
|
||||||
return;
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
// get the related l10n object
|
// get the related l10n object
|
||||||
var key = element.dataset.l10nId;
|
var key = element.dataset.l10nId;
|
||||||
var data = getL10nData(key);
|
var data = getL10nData(key);
|
||||||
if (!data)
|
if (!data) {
|
||||||
return;
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
// get arguments (if any)
|
// get arguments (if any)
|
||||||
// TODO: more flexible parser?
|
// TODO: more flexible parser?
|
||||||
var args;
|
var args;
|
||||||
if (element.dataset.l10nArgs) try {
|
if (element.dataset.l10nArgs) {
|
||||||
args = JSON.parse(element.dataset.l10nArgs);
|
try {
|
||||||
} catch (e) {
|
args = JSON.parse(element.dataset.l10nArgs);
|
||||||
console.warn('[l10n] could not parse arguments for #' + key + '');
|
} catch (e) {
|
||||||
|
console.warn('[l10n] could not parse arguments for #' + key + '');
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// translate element
|
// translate element
|
||||||
// TODO: security check?
|
// TODO: security check?
|
||||||
for (var k in data)
|
for (var k in data) {
|
||||||
element[k] = substArguments(data[k], args);
|
element[k] = substArguments(data[k], args);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -80,12 +86,14 @@
|
|||||||
// check all translatable children (= w/ a `data-l10n-id' attribute)
|
// check all translatable children (= w/ a `data-l10n-id' attribute)
|
||||||
var children = element.querySelectorAll('*[data-l10n-id]');
|
var children = element.querySelectorAll('*[data-l10n-id]');
|
||||||
var elementCount = children.length;
|
var elementCount = children.length;
|
||||||
for (var i = 0; i < elementCount; i++)
|
for (var i = 0; i < elementCount; i++) {
|
||||||
translateElement(children[i]);
|
translateElement(children[i]);
|
||||||
|
}
|
||||||
|
|
||||||
// translate element itself if necessary
|
// translate element itself if necessary
|
||||||
if (element.dataset.l10nId)
|
if (element.dataset.l10nId) {
|
||||||
translateElement(element);
|
translateElement(element);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
window.addEventListener('DOMContentLoaded', function() {
|
window.addEventListener('DOMContentLoaded', function() {
|
||||||
@ -106,14 +114,16 @@
|
|||||||
get: translateString,
|
get: translateString,
|
||||||
|
|
||||||
// get the document language
|
// get the document language
|
||||||
getLanguage: function() { return gLanguage; },
|
getLanguage: function() {
|
||||||
|
return gLanguage;
|
||||||
|
},
|
||||||
|
|
||||||
// get the direction (ltr|rtl) of the current language
|
// get the direction (ltr|rtl) of the current language
|
||||||
getDirection: function() {
|
getDirection: function() {
|
||||||
// http://www.w3.org/International/questions/qa-scripts
|
// http://www.w3.org/International/questions/qa-scripts
|
||||||
// Arabic, Hebrew, Farsi, Pashto, Urdu
|
// Arabic, Hebrew, Farsi, Pashto, Urdu
|
||||||
var rtlList = ['ar', 'he', 'fa', 'ps', 'ur'];
|
var rtlList = ['ar', 'he', 'fa', 'ps', 'ur'];
|
||||||
return (rtlList.indexOf(gLanguage) >= 0) ? 'rtl' : 'ltr';
|
return (rtlList.indexOf(gLanguage) >= 0 ? 'rtl' : 'ltr');
|
||||||
},
|
},
|
||||||
|
|
||||||
// translate an element or document fragment
|
// translate an element or document fragment
|
||||||
|
Loading…
x
Reference in New Issue
Block a user