Merge branch 'master' of git://github.com/HansPinckaers/etherpad-lite

This commit is contained in:
Peter 'Pita' Martischka 2011-08-24 18:38:14 +01:00
commit 1ad95263cd

View file

@ -424,7 +424,7 @@ function OUTER(gscope)
else parenModule.notifyTick(); else parenModule.notifyTick();
} }
recolorModule.recolorLines(); recolorModule.recolorLines();
if (cs.selectionAffected) if (cs.selectionAffected && !(browser.safari && (type == "applyChangesToBase" || type == "idleWorkTimer")))
{ {
updateBrowserSelectionFromRep(); updateBrowserSelectionFromRep();
} }