fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

working but then create a second list, it will be stupid, SIGH

This commit is contained in:
John McLear 2013-04-09 01:22:09 +01:00
parent 7885c410b5
commit 2e76bd4e50
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/static/css/iframe_editor.css
View File

@ -254,12 +254,12 @@ ol.list-number8:before {
counter-increment: eighth 1;
}
ol.list-start1:before{ counter-reset: first 0; }
ol.list-start2:before{ counter-reset: second 0; }
ol.list-start3:before{ counter-reset: third 0; }
ol.list-start4:before{ counter-reset: fourth 0; }
ol.list-start5:before{ counter-reset: fifth 0; }
ol.list-start6:before{ counter-reset: sixth 0; }
ol.list-start7:before{ counter-reset: seventh 0; }
ol.list-start8:before{ counter-reset: eighth 0; }
ol.list-start-number1:before{ counter-reset: first 0; }
ol.list-start-number2:before{ counter-reset: second 0; }
ol.list-start-number3:before{ counter-reset: third 0; }
ol.list-start-number4:before{ counter-reset: fourth 0; }
ol.list-start-number5:before{ counter-reset: fifth 0; }
ol.list-start-number6:before{ counter-reset: sixth 0; }
ol.list-start-number7:before{ counter-reset: seventh 0; }
ol.list-start-number8:before{ counter-reset: eighth 0; }

9
src/static/js/domline.js
View File

@ -104,7 +104,6 @@ domline.createDomLine = function(nonEmpty, doesWrap, optBrowser, optDocument)
if (listType)
{
listType = listType[1];
start = start?'start="'+Security.escapeHTMLAttribute(start[1])+'"':'';
if (listType)
{
if(listType.indexOf("number") < 0)
@ -114,7 +113,13 @@ domline.createDomLine = function(nonEmpty, doesWrap, optBrowser, optDocument)
}
else
{
preHtml = '<ol '+start+' class="list-' + Security.escapeHTMLAttribute(listType) + '"><li>';
if(start){ // is it a start of a list with more than one item in?
if(start[1] == 1){ // if its the first one
preHtml = '<ol class="list-start-' + listType + ' list-' + Security.escapeHTMLAttribute(listType) + '"><li>';
}else{ // its the second+ item in this list level
preHtml = '<ol class="list-' + Security.escapeHTMLAttribute(listType) + '"><li>';
}
}
postHtml = '</li></ol>';
}
}