Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-09-03 06:27:02 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

1.10.4.183

Browse source 
---
Fixes:
New login form style display problem since version 1.10.4 (#1196)
Collapse the TO: field in message view (#1199)
Paste with HTML tags fails (#1193)
This commit is contained in:
RainLoop Team 2016-09-29 00:40:17 +03:00
parent 224362299a
commit 0bbb2f14a4
21 changed files with 1947 additions and 140 deletions
Download patch file Download diff file Expand all files Collapse all files

4
vendors/ckeditor/ckeditor.js vendored
View file

@ -368,7 +368,7 @@ e=b.block,d=c.endPath().block,e&&d&&!e.equals(d)?(a.fire("saveSnapshot"),(h=e.ge
this._.editable;if(b&&a)return 0;arguments.length&&(b=this._.editable=a?a instanceof CKEDITOR.editable?a:new CKEDITOR.editable(this,a):(b&&b.detach(),null));return b};CKEDITOR.on("instanceLoaded",function(b){var c=b.editor;c.on("insertElement",function(a){a=a.data;a.type==CKEDITOR.NODE_ELEMENT&&(a.is("input")||a.is("textarea"))&&("false"!=a.getAttribute("contentEditable")&&a.data("cke-editable",a.hasAttribute("contenteditable")?"true":"1"),a.setAttribute("contentEditable",!1))});c.on("selectionChange",
function(b){if(!c.readOnly){var d=c.getSelection();d&&!d.isLocked&&(d=c.checkDirty(),c.fire("lockSnapshot"),a(b),c.fire("unlockSnapshot"),!d&&c.resetDirty())}})});CKEDITOR.on("instanceCreated",function(a){var b=a.editor;b.on("mode",function(){var a=b.editable();if(a&&a.isInline()){var c=b.title;a.changeAttr("role","textbox");a.changeAttr("aria-label",c);c&&a.changeAttr("title",c);var d=b.fire("ariaEditorHelpLabel",{}).label;if(d&&(c=this.ui.space(this.elementMode==CKEDITOR.ELEMENT_MODE_INLINE?"top":
"contents"))){var f=CKEDITOR.tools.getNextId(),d=CKEDITOR.dom.element.createFromHtml('\x3cspan id\x3d"'+f+'" class\x3d"cke_voice_label"\x3e'+d+"\x3c/span\x3e");c.append(d);a.changeAttr("aria-describedby",f)}}})});CKEDITOR.addCss(".cke_editable{cursor:text}.cke_editable img,.cke_editable input,.cke_editable textarea{cursor:default}");e=CKEDITOR.dom.walker.whitespaces(!0);A=CKEDITOR.dom.walker.bookmark(!1,!0);r=CKEDITOR.dom.walker.empty();x=CKEDITOR.dom.walker.bogus();D=/(^|<body\b[^>]*>)\s*<(p|div|address|h\d|center|pre)[^>]*>\s*(?:<br[^>]*>|&nbsp;|\u00A0|&#160;)?\s*(:?<\/\2>)?\s*(?=$|<\/body>)/gi;
q=function(){function a(b){return b.type==CKEDITOR.NODE_ELEMENT}function b(c,d){var f,e,n,p,g=[],k=d.range.startContainer;f=d.range.startPath();for(var k=E[k.getName()],y=0,l=c.getChildren(),z=l.count(),J=-1,m=-1,q=0,u=f.contains(E.$list);y<z;++y)f=l.getItem(y),a(f)?(n=f.getName(),u&&n in CKEDITOR.dtd.$list?g=g.concat(b(f,d)):(p=!!k[n],"br"!=n||!f.data("cke-eol")||y&&y!=z-1||(q=(e=y?g[y-1].node:l.getItem(y+1))&&(!a(e)||!e.is("br")),e=e&&a(e)&&E.$block[e.getName()]),-1!=J||p||(J=y),p||(m=y),g.push({isElement:1,
q=function(){function a(b){return b.type==CKEDITOR.NODE_ELEMENT}function b(c,d){var f,e,n,p,g=[],k=d.range.startContainer;f=d.range.startPath();for(var k=E[k.getName()],y=0,l=c.getChildren(),z=l.count(),J=-1,m=-1,q=0,u=f.contains(E.$list);y<z;++y)f=l.getItem(y),a(f)?(n=f.getName(),u&&n in CKEDITOR.dtd.$list?g=g.concat(b(f,d)):(p=k&&!!k[n],"br"!=n||!f.data("cke-eol")||y&&y!=z-1||(q=(e=y?g[y-1].node:l.getItem(y+1))&&(!a(e)||!e.is("br")),e=e&&a(e)&&E.$block[e.getName()]),-1!=J||p||(J=y),p||(m=y),g.push({isElement:1,
isLineBreak:q,isBlock:f.isBlockBoundary(),hasBlockSibling:e,node:f,name:n,allowed:p}),e=q=0)):g.push({isElement:0,node:f,allowed:1});-1<J&&(g[J].firstNotAllowed=1);-1<m&&(g[m].lastNotAllowed=1);return g}function d(b,c){var f=[],e=b.getChildren(),h=e.count(),n,g=0,k=E[c],y=!b.is(E.$inline)||b.is("br");for(y&&f.push(" ");g<h;g++)n=e.getItem(g),a(n)&&!n.is(k)?f=f.concat(d(n,c)):f.push(n);y&&f.push(" ");return f}function f(b){return a(b.startContainer)&&b.startContainer.getChild(b.startOffset-1)}function e(b){return b&&
a(b)&&(b.is(E.$removeEmpty)||b.is("a")&&!b.isBlockBoundary())}function g(b,c,d,f){var e=b.clone(),h,n;e.setEndAt(c,CKEDITOR.POSITION_BEFORE_END);(h=(new CKEDITOR.dom.walker(e)).next())&&a(h)&&m[h.getName()]&&(n=h.getPrevious())&&a(n)&&!n.getParent().equals(b.startContainer)&&d.contains(n)&&f.contains(h)&&h.isIdentical(n)&&(h.moveChildren(n),h.remove(),g(b,c,d,f))}function J(b,c){function d(b,c){if(c.isBlock&&c.isElement&&!c.node.is("br")&&a(b)&&b.is("br"))return b.remove(),1}var f=c.endContainer.getChild(c.endOffset),
e=c.endContainer.getChild(c.endOffset-1);f&&d(f,b[b.length-1]);e&&d(e,b[0])&&(c.setEnd(c.endContainer,c.endOffset-1),c.collapse())}var E=CKEDITOR.dtd,m={p:1,div:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,ul:1,ol:1,li:1,pre:1,dl:1,blockquote:1},q={p:1,div:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1},u=CKEDITOR.tools.extend({},E.$inline);delete u.br;return function(m,C,B,I){var F=m.editor,K=!1;"unfiltered_html"==C&&(C="html",K=!0);if(!I.checkReadOnly()){var G=(new CKEDITOR.dom.elementPath(I.startContainer,I.root)).blockLimit||
@ -378,7 +378,7 @@ F.getParent())&&e(F);)I.push(F);C.moveToBookmark(L);if(L=B){L=m.range;if("text"=
fixForBody:!1,protectedWhitespaces:!!A,dontFilter:m.dontFilter,filter:m.editor.activeFilter,enterMode:m.editor.activeEnterMode});r=L.document.createElement("body");r.setHtml(B);A&&(r.getFirst().remove(),r.getLast().remove());if((A=L.startPath().block)&&(1!=A.getChildCount()||!A.getBogus()))a:{var x;if(1==r.getChildCount()&&a(x=r.getFirst())&&x.is(q)&&!x.hasAttribute("contenteditable")){A=x.getElementsByTag("*");L=0;for(I=A.count();L<I;L++)if(C=A.getItem(L),!C.is(u))break a;x.moveChildren(x.getParent(1));
x.remove()}}m.dataWrapper=r;L=B}if(L){x=m.range;L=x.document;var t;r=m.blockLimit;I=0;var D,A=[],M,H;B=F=0;var R,W;C=x.startContainer;var K=m.endPath.elements[0],X,G=K.getPosition(C),w=!!K.getCommonAncestor(C)&&G!=CKEDITOR.POSITION_IDENTICAL&&!(G&CKEDITOR.POSITION_CONTAINS+CKEDITOR.POSITION_IS_CONTAINED);C=b(m.dataWrapper,m);for(J(C,x);I<C.length;I++){G=C[I];if(t=G.isLineBreak){t=x;R=r;var T=void 0,aa=void 0;G.hasBlockSibling?t=1:(T=t.startContainer.getAscendant(E.$block,1))&&T.is({div:1,p:1})?(aa=
T.getPosition(R),aa==CKEDITOR.POSITION_IDENTICAL||aa==CKEDITOR.POSITION_CONTAINS?t=0:(R=t.splitElement(T),t.moveToPosition(R,CKEDITOR.POSITION_AFTER_START),t=1)):t=0}if(t)B=0<I;else{t=x.startPath();!G.isBlock&&k(m.editor,t.block,t.blockLimit)&&(H=l(m.editor))&&(H=L.createElement(H),H.appendBogus(),x.insertNode(H),CKEDITOR.env.needsBrFiller&&(D=H.getBogus())&&D.remove(),x.moveToPosition(H,CKEDITOR.POSITION_BEFORE_END));if((t=x.startPath().block)&&!t.equals(M)){if(D=t.getBogus())D.remove(),A.push(t);
M=t}G.firstNotAllowed&&(F=1);if(F&&G.isElement){t=x.startContainer;for(R=null;t&&!E[t.getName()][G.name];){if(t.equals(r)){t=null;break}R=t;t=t.getParent()}if(t)R&&(W=x.splitElement(R),m.zombies.push(W),m.zombies.push(R));else{R=r.getName();X=!I;t=I==C.length-1;R=d(G.node,R);for(var T=[],aa=R.length,ba=0,da=void 0,ea=0,ga=-1;ba<aa;ba++)da=R[ba]," "==da?(ea||X&&!ba||(T.push(new CKEDITOR.dom.text(" ")),ga=T.length),ea=1):(T.push(da),ea=0);t&&ga==T.length&&T.pop();X=T}}if(X){for(;t=X.pop();)x.insertNode(t);
M=t}G.firstNotAllowed&&(F=1);if(F&&G.isElement){t=x.startContainer;for(R=null;t&&(!E||!E[t.getName()]||!E[t.getName()][G.name]);){if(t.equals(r)){t=null;break}R=t;t=t.getParent()}if(t)R&&(W=x.splitElement(R),m.zombies.push(W),m.zombies.push(R));else{R=r.getName();X=!I;t=I==C.length-1;R=d(G.node,R);for(var T=[],aa=R.length,ba=0,da=void 0,ea=0,ga=-1;ba<aa;ba++)da=R[ba]," "==da?(ea||X&&!ba||(T.push(new CKEDITOR.dom.text(" ")),ga=T.length),ea=1):(T.push(da),ea=0);t&&ga==T.length&&T.pop();X=T}}if(X){for(;t=X.pop();)x.insertNode(t);
X=0}else x.insertNode(G.node);G.lastNotAllowed&&I<C.length-1&&((W=w?K:W)&&x.setEndAt(W,CKEDITOR.POSITION_AFTER_START),F=0);x.collapse()}}1!=C.length?D=!1:(D=C[0],D=D.isElement&&"false"==D.node.getAttribute("contenteditable"));D&&(B=!0,t=C[0].node,x.setStartAt(t,CKEDITOR.POSITION_BEFORE_START),x.setEndAt(t,CKEDITOR.POSITION_AFTER_END));m.dontMoveCaret=B;m.bogusNeededBlocks=A}D=m.range;var S;W=m.bogusNeededBlocks;for(X=D.createBookmark();M=m.zombies.pop();)M.getParent()&&(H=D.clone(),H.moveToElementEditStart(M),
H.removeEmptyBlocksAtEnd());if(W)for(;M=W.pop();)CKEDITOR.env.needsBrFiller?M.appendBogus():M.append(D.document.createText(" "));for(;M=m.mergeCandidates.pop();)M.mergeSiblings();D.moveToBookmark(X);if(!m.dontMoveCaret){for(M=f(D);M&&a(M)&&!M.is(E.$empty);){if(M.isBlockBoundary())D.moveToPosition(M,CKEDITOR.POSITION_BEFORE_END);else{if(e(M)&&M.getHtml().match(/(\s|&nbsp;)$/g)){S=null;break}S=D.clone();S.moveToPosition(M,CKEDITOR.POSITION_BEFORE_END)}M=M.getLast(c)}S&&D.moveToRange(S)}}}}();w=function(){function a(b){b=
new CKEDITOR.dom.walker(b);b.guard=function(a,b){if(b)return!1;if(a.type==CKEDITOR.NODE_ELEMENT)return a.is(CKEDITOR.dtd.$tableContent)};b.evaluator=function(a){return a.type==CKEDITOR.NODE_ELEMENT};return b}function b(a,c,d){c=a.getDocument().createElement(c);a.append(c,d);return c}function c(a){var b=a.count(),d;for(b;0<b--;)d=a.getItem(b),CKEDITOR.tools.trim(d.getHtml())||(d.appendBogus(),CKEDITOR.env.ie&&9>CKEDITOR.env.version&&d.getChildCount()&&d.getFirst().remove())}return function(d){var f=