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

Merge branch 'develop' of github.com:ether/etherpad-lite into fix/reimplement-ace-getAttributeOnSelection

Browse source
This commit is contained in:
John McLear 2015-01-05 17:15:38 +00:00
commit c0078abc75
23 changed files with 467 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/static/css/iframe_editor.css
View file

@ -269,32 +269,32 @@ ol.list-number16{ text-indent: 150px; }
}
.list-number8 li:before {
content: counter(first) "." counter(second) "." counter(third) "." counter(fourth) "." counter(fifth) "." counter(sixth) "." counter(eighth) ". " ;
content: counter(first) "." counter(second) "." counter(third) "." counter(fourth) "." counter(fifth) "." counter(sixth) "." counter(seventh) "." counter(eighth) ". " ;
counter-increment: eighth 1;
}
.list-number9 li:before {
content: counter(first) "." counter(second) "." counter(third) "." counter(fourth) "." counter(fifth) "." counter(sixth) "." counter(eighth) "." counter(ninth) ". ";
content: counter(first) "." counter(second) "." counter(third) "." counter(fourth) "." counter(fifth) "." counter(sixth) "." counter(seventh) "." counter(eighth) "." counter(ninth) ". ";
counter-increment: ninth 1;
}
.list-number10 li:before {
content: counter(first) "." counter(second) "." counter(third) "." counter(fourth) "." counter(fifth) "." counter(sixth) "." counter(eighth) "." counter(ninth) "." counter(tenth) ". ";
content: counter(first) "." counter(second) "." counter(third) "." counter(fourth) "." counter(fifth) "." counter(sixth) "." counter(seventh) "." counter(eighth) "." counter(ninth) "." counter(tenth) ". ";
counter-increment: tenth 1;
}
.list-number11 li:before {
content: counter(first) "." counter(second) "." counter(third) "." counter(fourth) "." counter(fifth) "." counter(sixth) "." counter(eighth) "." counter(ninth) "." counter(tenth) "." counter(eleventh) ". ";
content: counter(first) "." counter(second) "." counter(third) "." counter(fourth) "." counter(fifth) "." counter(sixth) "." counter(seventh) "." counter(eighth) "." counter(ninth) "." counter(tenth) "." counter(eleventh) ". ";
counter-increment: eleventh 1;
}
.list-number12 li:before {
content: counter(first) "." counter(second) "." counter(third) "." counter(fourth) "." counter(fifth) "." counter(sixth) "." counter(eighth) "." counter(ninth) "." counter(tenth) "." counter(eleventh) "." counter(twelth) ". ";
content: counter(first) "." counter(second) "." counter(third) "." counter(fourth) "." counter(fifth) "." counter(sixth) "." counter(seventh) "." counter(eighth) "." counter(ninth) "." counter(tenth) "." counter(eleventh) "." counter(twelth) ". ";
counter-increment: twelth 1;
}
.list-number13 li:before {
content: counter(first) "." counter(second) "." counter(third) "." counter(fourth) "." counter(fifth) "." counter(sixth) "." counter(eighth) "." counter(ninth) "." counter(tenth) "." counter(eleventh) "." counter(twelth) "." counter(thirteenth) ". ";
content: counter(first) "." counter(second) "." counter(third) "." counter(fourth) "." counter(fifth) "." counter(sixth) "." counter(seventh) "." counter(eighth) "." counter(ninth) "." counter(tenth) "." counter(eleventh) "." counter(twelth) "." counter(thirteenth) ". ";
counter-increment: thirteenth 1;
}

3
src/static/css/pad.css
View file

@ -689,6 +689,9 @@ table#otheruserstable {
#exportpdfa:before {
content: "\e803";
}
#exportetherpada:before {
content: "\e806";
}
#exportopena:before {
content: "\e805";
}

8
src/static/css/timeslider.css
View file

@ -154,11 +154,17 @@ stepper:active{
top: 20px;
width: 25px;
}
.star:before{
font-family: fontawesome-etherpad;
content: "\e835";
vertical-align:middle;
font-size:16px;
}
#timeslider .star {
cursor: pointer;
height: 16px;
position: absolute;
top: 40px;
top: 25px;
width: 15px;
}
#timeslider #timer {

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

@ -169,11 +169,11 @@ AttributeManager.prototype = _(AttributeManager.prototype).extend({
if(attrib[0] === attributeName) return [attributeName, null]
return attrib
})
if(hasMarker){
ChangesetUtils.buildKeepRange(this.rep, builder, loc, (loc = [lineNum, 0]));
// If length == 4, there's [author, lmkr, insertorder, + the attrib being removed] thus we can remove the marker entirely
if(attribs.length == 4) ChangesetUtils.buildRemoveRange(this.rep, builder, loc, (loc = [lineNum, 1]))
if(attribs.length <= 4) ChangesetUtils.buildRemoveRange(this.rep, builder, loc, (loc = [lineNum, 1]))
else ChangesetUtils.buildKeepRange(this.rep, builder, loc, (loc = [lineNum, 1]), attribs, this.rep.apool);
}

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

@ -5052,6 +5052,7 @@ function Ace2Inner(){
{
if(listType == ''){
documentAttributeManager.removeAttributeOnLine(lineNum, listAttributeName);
documentAttributeManager.removeAttributeOnLine(lineNum, 'start');
}else{
documentAttributeManager.setAttributeOnLine(lineNum, listAttributeName, listType);
}

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

@ -518,7 +518,11 @@ function makeContentCollector(collectStyles, browser, apool, domInterface, class
}
if (tname == "ul" || tname == "ol")
{
var type = node.attribs.class;
if(node.attribs){
var type = node.attribs.class;
}else{
var type = null;
}
var rr = cls && /(?:^| )list-([a-z]+[12345678])\b/.exec(cls);
// lists do not need to have a type, so before we make a wrong guess, check if we find a better hint within the node's children
if(!rr && !type){

7
src/static/js/pad_impexp.js
View file

@ -109,6 +109,8 @@ var padimpexp = (function()
msg = html10n.get("pad.impexp.convertFailed");
} else if(status === "uploadFailed"){
msg = html10n.get("pad.impexp.uploadFailed");
} else if(status === "padHasData"){
msg = html10n.get("pad.impexp.padHasData");
}
function showError(fade)
@ -198,6 +200,7 @@ var padimpexp = (function()
// build the export links
$("#exporthtmla").attr("href", pad_root_path + "/export/html");
$("#exportetherpada").attr("href", pad_root_path + "/export/etherpad");
$("#exportplaina").attr("href", pad_root_path + "/export/txt");
// activate action to import in the form
@ -234,13 +237,13 @@ var padimpexp = (function()
$('#importform').submit(fileInputSubmit);
$('.disabledexport').click(cantExport);
},
handleFrameCall: function(status)
handleFrameCall: function(directDatabaseAccess, status)
{
if (status !== "ok")
{
importFailed(status);
}
if(directDatabaseAccess) pad.switchToPad(clientVars.padId);
importDone();
},
disable: function()