Merge pull request #1197 from hcartiaux/urlfix

Fix urls, use github.com/ether
This commit is contained in:
John McLear 2012-11-21 16:22:21 -08:00
commit 1899e3f48d
6 changed files with 6 additions and 6 deletions

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
*/
/*

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");
}
}