Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-16 18:56:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed translator backwards compatibility issue

Browse Source 
Also removed the _clearMenus global object because populating the global namespace is bad, bad, bad
This commit is contained in:
Peter Jaszkowiak
2015-05-03 23:36:23 -06:00
parent a93a1d720d
commit ad7b561dd4
2 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/src/modules/translator.js
View File

@@ -295,11 +295,13 @@
if (typeof define === 'function' && define.amd) { if (typeof define === 'function' && define.amd) {
define('translator', translator); define('translator', translator);
var _translator = translator;
// Expose a global `translator` object for backwards compatibility // Expose a global `translator` object for backwards compatibility
window.translator = { window.translator = {
translate: function() { translate: function() {
console.warn('[translator] Global invocation of the translator is now deprecated, please `require` the module instead.'); console.warn('[translator] Global invocation of the translator is now deprecated, please `require` the module instead.');
translator.translate.apply(translator, arguments); _translator.translate.apply(_translator, arguments);
} }
} }
} }

42
public/src/overrides.js
View File

@@ -79,25 +79,27 @@ if ('undefined' !== typeof window) {
})(jQuery || {fn:{}}); })(jQuery || {fn:{}});
(function(){
// FIX FOR #1245 - https://github.com/NodeBB/NodeBB/issues/1245 // FIX FOR #1245 - https://github.com/NodeBB/NodeBB/issues/1245
// from http://stackoverflow.com/questions/15931962/bootstrap-dropdown-disappear-with-right-click-on-firefox // from http://stackoverflow.com/questions/15931962/bootstrap-dropdown-disappear-with-right-click-on-firefox
// obtain a reference to the original handler // obtain a reference to the original handler
var _clearMenus = $._data(document, "events").click.filter(function (el) { var _clearMenus = $._data(document, "events").click.filter(function (el) {
return el.namespace === 'bs.data-api.dropdown' && el.selector === undefined; return el.namespace === 'bs.data-api.dropdown' && el.selector === undefined;
});
if(_clearMenus.length) {
_clearMenus = _clearMenus[0].handler;
}
// disable the old listener
$(document)
.off('click.data-api.dropdown', _clearMenus)
.on('click.data-api.dropdown', function (e) {
// call the handler only when not right-click
if (e.button !== 2) {
_clearMenus();
}
}); });
if(_clearMenus.length) {
_clearMenus = _clearMenus[0].handler;
}
// disable the old listener
$(document)
.off('click.data-api.dropdown', _clearMenus)
.on('click.data-api.dropdown', function (e) {
// call the handler only when not right-click
if (e.button !== 2) {
_clearMenus();
}
});
})();
} }