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

merged develop back in

Browse source
This commit is contained in:
Peter 'Pita' Martischka 2012-11-03 18:16:36 +00:00
commit 6408581adb
19 changed files with 255 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -516,7 +516,7 @@ function makeContentCollector(collectStyles, browser, apool, domInterface, class
{
var type;
var rr = cls && /(?:^| )list-([a-z]+[12345678])\b/.exec(cls);
type = rr && rr[1] || "bullet" + String(Math.min(_MAX_LIST_LEVEL, (state.listNesting || 0) + 1));
type = rr && rr[1] || (tname == "ul" ? "bullet" : "number") + String(Math.min(_MAX_LIST_LEVEL, (state.listNesting || 0) + 1));
oldListTypeOrNull = (_enterList(state, type) || 'none');
}
else if ((tname == "div" || tname == "p") && cls && cls.match(/(?:^| )ace-line\b/))

1
src/static/js/timeslider.js
View file

@ -158,6 +158,7 @@ function handleClientVars(message)
{
fireWhenAllScriptsAreLoaded[i]();
}
$("#ui-slider-handle").css('left', $("#ui-slider-bar").width() - 2);
}
exports.baseURL = '';