mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-21 07:56:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote branch 'ether/develop'

Browse source
This commit is contained in:
Iván Eixarch 2012-11-23 22:57:05 +01:00
commit 0250f8d55c
12 changed files with 77 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/static/js/AttributePool.js
View file

@ -3,7 +3,7 @@
* 90% of the code is still like in the original Etherpad
* Look at https://github.com/ether/pad/blob/master/infrastructure/ace/www/easysync2.js
* You can find a explanation what a attribute pool is here:
* https://github.com/Pita/etherpad-lite/blob/master/doc/easysync/easysync-notes.txt
* https://github.com/ether/etherpad-lite/blob/master/doc/easysync/easysync-notes.txt
*/
/*

2
src/static/js/ace2_inner.js
View file

@ -3266,7 +3266,7 @@ function Ace2Inner(){
}
}
//hide the dropdownso
if(window.parent.parent.padeditbar){ // required in case its in an iframe should probably use parent.. See Issue 327 https://github.com/Pita/etherpad-lite/issues/327
if(window.parent.parent.padeditbar){ // required in case its in an iframe should probably use parent.. See Issue 327 https://github.com/ether/etherpad-lite/issues/327
window.parent.parent.padeditbar.toggleDropDown("none");
}
}

4
src/static/js/l10n.js
View file

@ -902,7 +902,7 @@ document.webL10n = (function(window, document, undefined) {
// browser-specific startup
if (document.addEventListener) { // modern browsers and IE9+
document.addEventListener('DOMContentLoaded', function() {
var lang = document.documentElement.lang || navigator.language;
var lang = document.documentElement.lang || navigator.language || navigator.userLanguage || 'en';
loadLocale(lang, translateFragment);
}, false);
} else if (window.attachEvent) { // IE8 and before (= oldIE)
@ -977,7 +977,7 @@ document.webL10n = (function(window, document, undefined) {
// startup for IE<9
window.attachEvent('onload', function() {
gTextProp = document.body.textContent ? 'textContent' : 'innerText';
var lang = document.documentElement.lang || window.navigator.userLanguage;
var lang = document.documentElement.lang || navigator.language || navigator.userLanguage || 'en';
loadLocale(lang, translateFragment);
});
}

2
src/static/js/pad.js
View file

@ -310,7 +310,7 @@ function handshake()
}
else if(obj.accessStatus == "wrongPassword")
{
$("#editorloadingbox").html("<b>You're password was wrong</b><br>" +
$("#editorloadingbox").html("<b>Your password was wrong</b><br>" +
"<input id='passwordinput' type='password' name='password'>"+
"<button type='button' onclick=\"" + padutils.escapeHtml('require('+JSON.stringify(module.id)+").savePassword()") + "\">ok</button>");
}