spacevillain (spacevillain) wrote in changelog,
spacevillain
spacevillain
changelog

[livejournal] r22570: LJSUP-13191: Map dialog in RTE

Committer: atyurin
LJSUP-13191: Map dialog in RTE
U   trunk/htdocs/js/ck/ckeditor.js
U   trunk/htdocs/js/ck/plugins/livejournal/plugin.js
Modified: trunk/htdocs/js/ck/ckeditor.js
===================================================================
--- trunk/htdocs/js/ck/ckeditor.js	2012-08-03 14:00:42 UTC (rev 22569)
+++ trunk/htdocs/js/ck/ckeditor.js	2012-08-03 14:28:31 UTC (rev 22570)
@@ -127,7 +127,7 @@
 if(C.type!=1)C=C.getParent();while(C){var D=C.getAttribute('lj-cmd');if(o.hasOwnProperty(D)){var E=t.getCommand(D);if(E.state==1){var F=new d.selection(t.document);o[D].node=C.is('body')?new h.get(C.getWindow().$.frameElement):C;F.selectElement(o[D].node);B.data.dialog='';q=true;E.exec();break;}}C=C.getParent();}};function v(B){var C=this;if(C.$!=t.document.$){C.$.className=(C.frame.getAttribute('lj-class')||'')+' lj-selected';if(C.getAttribute('lj-cmd')=='LJPollLink')C.frame.setStyle('height',C.getDocument().$.body.scrollHeight+'px');new d.selection(t.document).selectElement(C.frame);}B.data.getKey()==1&&B.data.preventDefault();};function w(B){if(B.data.getKey()==46){var C=new d.selection(t.document).getRanges(),D=C.length;while(D--)C[D].deleteContents();}};function x(){var E=this;var B=E.$.contentWindow,C=B.document,D=new h.get(C.body);if(D.on){D.on('dblclick',u);D.on('click',v);D.on('keyup',w);if(E.getAttribute('lj-cmd')=='LJPollLink'&&E.hasAttribute('style'))C.body.className='lj-poll lj-poll-open';}C=new h.get(C);C.frame=D.frame=E;};function y(){var B=t.document.getElementsByTag('iframe'),C=B.count(),D,E,F,G,H;q=false;while(C--){D=B.getItem(C),E=D.getAttribute('lj-cmd'),F=D.$.contentWindow,G=F.document,H=D.getAttribute('lj-style')||'';D.removeListener('load',x);D.on('load',x);G.open();G.write('<!DOCTYPE html><html style="'+H+'">'+'<head><link rel="stylesheet" href="'+a.styleText+'" /></head>'+'<body scroll="no" class="'+(D.getAttribute('lj-class')||'')+'" style="'+H+'" '+(E?'lj-cmd="'+E+'"':'')+'>'+decodeURIComponent(D.getAttribute('lj-content')||'')+'</body>'+'</html>');G.close();}};function z(B){if(t.onSwitch===true){delete t.onSwitch;return;}var C,D=B.name=='click',E=B.name=='selectionChange'||D,F=B.data.element||B.data.getTarget(),G,H;if(D&&(B.data.getKey()==1||B.data.$.button==0))B.data.preventDefault();if(F.type!=1)F=F.getParent();G=F;if(E){var I=t.document.getElementsByTag('iframe'),J,K;if(D&&G.is('iframe')){K=G.$.contentWindow.document.body;K.className=(G.getAttribute('lj-class')||'')+' lj-selected';if(G.getAttribute('lj-cmd')=='LJPollLink')G.setStyle('height',K.scrollHeight+'px');}for(var L=0,M=I.count();L<M;L++){J=I.getItem(L);if(J.$!=G.$){K=J.$.contentWindow.document.body;K.className=J.getAttribute('lj-class')||'';if(J.getAttribute('lj-cmd')=='LJPollLink'&&K.className.indexOf('lj-poll')!=-1)J.removeAttribute('style');}}}do{var N=G.getAttribute('lj-cmd');if(!N&&G.type==1){var O=G.getParent();if(G.is('img')&&O.getParent()&&!O.getParent().hasAttribute('lj:user')){N='image';
 G.setAttribute('lj-cmd',N);}else if(G.is('a')&&!O.hasAttribute('lj:user')){N='LJLink2';G.setAttribute('lj-cmd',N);}}if(N&&o.hasOwnProperty(N)){if(E){o[N].node=G;t.getCommand(N).setState(1);}(C||(C={}))[N]={content:o[N].html,node:G};}}while(G=G.getParent());if(E)for(H in o){if(o.hasOwnProperty(H)&&(!C||!C.hasOwnProperty(H))){delete o[H].node;t.getCommand(H).setState(2);}}C?a.note.show(C):a.note.hide();};(function(){function B(H){return H.slice(-2)=='/>'?H:H.slice(0,-1)+'/>';};function C(H){var I=new Poll(H),J="<div class='lj-poll-inner lj-rtebox-inner'>"+I.outputHTML()+'</div>';return '<iframe class="lj-poll-wrap lj-rtebox" lj-class="lj-poll" frameborder="0" lj-cmd="LJPollLink" allowTransparency="true" lj-data="'+I.outputLJtags()+'" lj-content="'+J+'"></iframe>';};function D(H,I){var J="<div class='lj-poll-inner lj-rtebox-inner'>Poll id: "+I+'</div>';return '<iframe class="lj-poll-wrap lj-poll-wrap-done lj-rtebox" lj-class="lj-poll" frameborder="0" lj-cmd="LJPollLink" allowTransparency="true" lj-data="'+escape(H)+'" lj-content="'+J+'" data-disabledPoll="true"></iframe>';};function E(H,I,J){var K="<div class='lj-embed-inner lj-rtebox-inner'>Embed video</div>";return '<iframe class="lj-embed-wrap lj-rtebox" lj-class="lj-embed" frameborder="0" lj-cmd="LJEmbedLink" allowTransparency="true" lj-data="'+encodeURIComponent(J)+'"'+I+'lj-content="'+K+'"></iframe>';};function F(H,I,J,K){return I+J.replace(/\n/g,'')+K;};function G(H,I,J,K){var L=I||J||m.LJRepost_Value,M=K.replace(/"/g,'&quot;');K=M+('<br /><input type="button" value="'+L+'" />').replace(/"/g,'&quot;');return '<iframe class="lj-repost-wrap" lj-class="lj-repost" frameborder="0" allowTransparency="true" lj-text="'+M+'" lj-button="'+L+'" lj-content="'+K+'"></iframe>';};t.dataProcessor.toHtml=function(H,I){H=H.replace(/<lj [^>]*?>/gi,B).replace(/<lj-map [^>]*?>/gi,B).replace(/<lj-template[^>]*?>/gi,B).replace(/(<lj-cut[^>]*?)\/>/gi,'$1>').replace(/<((?!br)[^\s>]+)([^>]*?)\/>/gi,'<$1$2></$1>').replace(/<lj-poll.*?>[\s\S]*?<\/lj-poll>/gi,C).replace(/<lj-poll-([0-9]+)>/gi,D).replace(/<lj-repost\s*(?:button\s*=\s*(?:"([^"]*?)")|(?:"([^']*?)"))?.*?>([\s\S]*?)<\/lj-repost>/gi,G).replace(/<lj-embed(.*?)>([\s\S]*?)<\/lj-embed>/gi,E);if(!$('event_format').checked){H=H.replace(/(<lj-raw.*?>)([\s\S]*?)(<\/lj-raw>)/gi,F);if(!window.switchedRteOn)H=H.replace(/\n/g,'<br />');}H=a.htmlDataProcessor.prototype.toHtml.call(this,H,I);if(c)H='<xml:namespace ns="livejournal" prefix="lj" />'+H;return H;};})();t.dataProcessor.toDataFormat=function(B,C){B=a.htmlDataProcessor.prototype.toDataFormat.call(this,B,C);
 if(!$('event_format').checked)B=B.replace(/<br\s*\/>/gi,'\n');return B.replace(/\t/g,' ');};t.dataProcessor.writer.indentationChars='';t.dataProcessor.writer.lineBreakChars='';t.on('selectionChange',z);t.on('doubleclick',u);t.on('afterCommandExec',y);t.on('dialogHide',y);t.on('dataReady',function(){if(!a.note)r(t);if(c){t.document.getBody().on('dragend',y);t.document.getBody().on('paste',function(){setTimeout(y,0);});}t.document.on('click',z);t.document.on('mouseout',a.note.hide);t.document.on('mouseover',z);t.document.getBody().on('keyup',w);y();});(function(){var B=top.Site.siteroot+'/tools/endpoints/ljuser.bml',C='LJUserLink';function D(F,G,H){if(F.error){LiveJournal.run_hook('incorrect_user');return;}if(F.success){F.ljuser=F.ljuser.replace('<span class="useralias-value">*</span>','');p[G]=F.ljuser;var I=new h.createFromHtml(F.ljuser);I.setAttribute('lj-cmd','LJUserLink');if(H)H.$.parentNode.replaceChild(I.$,H.$);else t.insertElement(I);}};var E=false;t.addCommand('LJUserLink',{exec:function(F){var G='',H=new d.selection(F.document),I=o.LJUserLink.node,J;function K(M){parent.HTTPReq.getJSON({data:parent.HTTPReq.formEncoded({username:M}),method:'POST',url:B,onData:function(N){D(N,M,o.LJUserLink.node);}});};if(!E){var L=I;LiveJournal.register_hook('user_response',function(M){K(M);});E=true;}if(I){a.note&&a.note.hide(true);J=o.LJUserLink.node.getElementsByTag('b').getItem(0).getText();LiveJournal.run_hook('rteButton','user',jQuery('.cke_button_'+C),{user:J});return;}else if(H.getType()==2)G=H.getSelectedText();if(G==''){LiveJournal.run_hook('rteButton','user',jQuery('.cke_button_'+C));return;}if(!G||J==G)return;K(G,I);}});t.ui.addButton('LJUserLink',{label:m.LJUser,command:'LJUserLink'});})();(function(){var B='LJImage';if(window.ljphotoEnabled&&window.ljphotoMigrationStatus===LJ.getConst('LJPHOTO_MIGRATION_NONE'))t.ui.addButton('image',{label:m.LJImage_Title,command:'image'});else{t.addCommand(B,{exec:function(){jQuery('.b-updatepage-event-section').editor('handleImageUpload','upload');},editorFocus:false});t.ui.addButton('image',{label:m.LJImage_Title,command:B});}})();(function(){var B='LJEmbedLink',C='video';function D(E){var F=new h('iframe',t.document);F.setAttribute('lj-data',encodeURIComponent(E));F.setAttribute('lj-content',encodeURIComponent("<div class='lj-embed-inner lj-rtebox-inner'>Embed video</div>"));F.setAttribute('lj-class','lj-embed');F.setAttribute('lj-cmd',B);F.setAttribute('class','lj-embed-wrap lj-rtebox');F.setAttribute('frameBorder',0);
-F.setAttribute('allowTransparency','true');t.insertElement(F);y();};LiveJournal.register_hook(C+'_response',function(E){D(E);});t.addCommand(B,{exec:function(){var E=o[B].node;if(E)LiveJournal.run_hook('rteButton',C,jQuery('.cke_button_'+B),{defaultText:E&&decodeURIComponent(E.getAttribute('lj-data')),editMode:true});else LiveJournal.run_hook('rteButton',C,jQuery('.cke_button_'+B));}});t.ui.addButton(B,{label:m.LJEmbed,command:B});})();function A(B,C,D){var E,F=o[C].node;if(F){if(E=D.skip||prompt(D.title,F.getAttribute('text')||D.text))if(E==D.text)F.removeAttribute('text');else F.setAttribute('text',E);}else{if(E=D.skip||prompt(D.title,D.text)){t.focus();var G=new d.selection(t.document),H=G.getRanges(),I=new h('iframe',t.document),J=I.clone();I.setAttribute('lj-cmd',C);I.setAttribute('lj-class',B+' '+B+'-open');I.setAttribute('class',B+'-wrap');I.setAttribute('frameBorder',0);I.setAttribute('allowTransparency','true');if(E!=D.text)I.setAttribute('text',E);J.setAttribute('lj-class',B+' '+B+'-close');J.setAttribute('class',B+'-wrap');J.setAttribute('frameBorder',0);J.setAttribute('allowTransparency','true');var K=H[0];G.lock();var L=new h('br',t.document),M=L.clone(),N=L.clone(),O=new d.documentFragment(t.document);O.append(L.clone());O.append(I);O.append(M);if(K.collapsed===false)for(var P=0,Q=H.length;P<Q;P++){if(G.getSelectedElement())H[P].enlarge(1);O.append(H[P].extractContents());}O.append(N);t.insertElement(J);L.clone().insertAfter(J);J.insertBeforeMe(O);K.setStart(M,0);K.setEnd(N,0);G.unlock();G.selectRanges(H);t.fire('updateSnapshot');y();}a.note&&a.note.hide(true);}};(function(){var B='LJMap',C='map';LiveJournal.register_hook('map_response',function(D){var E=new h('iframe',t.document),F=800,G=600,H='',I='';if(!isNaN(F)){H+='width:'+F+'px;';I+='width:'+(F-2)+'px;';}if(!isNaN(G)){H+='height:'+G+'px;';I+='height:'+(G-2)+'px;';}E.setAttributes({'lj-url':D,'class':'lj-map-wrap lj-rtebox','lj-content':'<div class="lj-map-inner lj-rtebox-inner"><p class="lj-map">map</p></div>','lj-cmd':'LJMap','lj-class':'lj-map',frameborder:0,allowTransparency:'true',style:H,'lj-style':I});t.insertElement(E);y();});t.addCommand(B,{exec:function(){var D=o[B].node;LiveJournal.run_hook('rteButton',C,jQuery('.cke_button_'+B),{defaultText:D?D.getAttribute('text'):'',editMode:D?true:false});},editorFocus:false});t.ui.addButton(B,{label:m.LJMap_Title,command:B});})();(function(){var B='LJCut',C='cut';LiveJournal.register_hook('cut_response',function(D){A('lj-cut',B,{title:m.LJCut_PromptTitle,text:m.LJCut_PromptText,skip:D});
+F.setAttribute('allowTransparency','true');t.insertElement(F);y();};LiveJournal.register_hook(C+'_response',function(E){D(E);});t.addCommand(B,{exec:function(){var E=o[B].node;if(E)LiveJournal.run_hook('rteButton',C,jQuery('.cke_button_'+B),{defaultText:E&&decodeURIComponent(E.getAttribute('lj-data')),editMode:true});else LiveJournal.run_hook('rteButton',C,jQuery('.cke_button_'+B));}});t.ui.addButton(B,{label:m.LJEmbed,command:B});})();function A(B,C,D){var E,F=o[C].node;if(F){if(E=D.skip||prompt(D.title,F.getAttribute('text')||D.text))if(E==D.text)F.removeAttribute('text');else F.setAttribute('text',E);}else{if(E=D.skip||prompt(D.title,D.text)){t.focus();var G=new d.selection(t.document),H=G.getRanges(),I=new h('iframe',t.document),J=I.clone();I.setAttribute('lj-cmd',C);I.setAttribute('lj-class',B+' '+B+'-open');I.setAttribute('class',B+'-wrap');I.setAttribute('frameBorder',0);I.setAttribute('allowTransparency','true');if(E!=D.text)I.setAttribute('text',E);J.setAttribute('lj-class',B+' '+B+'-close');J.setAttribute('class',B+'-wrap');J.setAttribute('frameBorder',0);J.setAttribute('allowTransparency','true');var K=H[0];G.lock();var L=new h('br',t.document),M=L.clone(),N=L.clone(),O=new d.documentFragment(t.document);O.append(L.clone());O.append(I);O.append(M);if(K.collapsed===false)for(var P=0,Q=H.length;P<Q;P++){if(G.getSelectedElement())H[P].enlarge(1);O.append(H[P].extractContents());}O.append(N);t.insertElement(J);L.clone().insertAfter(J);J.insertBeforeMe(O);K.setStart(M,0);K.setEnd(N,0);G.unlock();G.selectRanges(H);t.fire('updateSnapshot');y();}a.note&&a.note.hide(true);}};(function(){var B='LJMap',C='map';LiveJournal.register_hook('map_response',function(D){var E=new h('iframe',t.document),F=800,G=600,H='',I='';if(!isNaN(F)){H+='width:'+F+'px;';I+='width:'+(F-2)+'px;';}if(!isNaN(G)){H+='height:'+G+'px;';I+='height:'+(G-2)+'px;';}var J=o[B].node;if(J)J.setAttributes({'lj-url':D});else{E.setAttributes({'lj-url':D,'class':'lj-map-wrap lj-rtebox','lj-content':'<div class="lj-map-inner lj-rtebox-inner"><p class="lj-map">map</p></div>','lj-cmd':'LJMap','lj-class':'lj-map',frameborder:0,allowTransparency:'true',style:H,'lj-style':I});t.insertElement(E);}y();});t.addCommand(B,{exec:function(){var D=o[B].node;LiveJournal.run_hook('rteButton',C,jQuery('.cke_button_'+B),{defaultText:D?D.getAttribute('lj-url'):'',editMode:D?true:false});},editorFocus:false});t.ui.addButton(B,{label:m.LJMap_Title,command:B});})();(function(){var B='LJCut',C='cut';LiveJournal.register_hook('cut_response',function(D){A('lj-cut',B,{title:m.LJCut_PromptTitle,text:m.LJCut_PromptText,skip:D});
 });t.addCommand('LJCut',{exec:function(){var D=o[B].node;LiveJournal.run_hook('rteButton',C,jQuery('.cke_button_'+B),{defaultText:D?D.getAttribute('text'):'',editMode:D?true:false});},editorFocus:false});t.ui.addButton(B,{label:m.LJCut_Title,command:B});})();(function(){var B='LJSpoiler',C='spoiler';LiveJournal.register_hook('spoiler_response',function(D){A('lj-spoiler',B,{title:m.LJCut_PromptTitle,text:m.LJCut_PromptText,skip:D});});t.addCommand(B,{exec:function(){var D=o[B].node;LiveJournal.run_hook('rteButton',C,jQuery('.cke_button_'+B),{defaultText:D?D.getAttribute('text'):'',editMode:D?true:false});},editorFocus:false});t.ui.addButton(B,{label:m.LJSpoiler_Title,command:B});})();(function(){function B(I,J){J=J===undefined||J;var K,L=o.LJLike.node;if(L){var M=I.getAttribute('lj-style');K=M?M.replace(/text-align:\s*(left|right|center)/i,'$1'):'left';}else if(J)K=I.getComputedStyle('text-align');else{while(!I.hasAttribute||!(I.hasAttribute('align')||I.getStyle('text-align'))){var N=I.getParent();if(!N)break;I=N;}K=I.getStyle('text-align')||I.getAttribute('align')||'';}K&&(K=K.replace(/-moz-|-webkit-|start|auto/i,''));!K&&J&&(K=I.getComputedStyle('direction')=='rtl'?'right':'left');return K;};function C(I){if(I.editor.readOnly)return;var J=I.editor.getCommand(this.name),K=I.data.element;if((K.type==1&&K.hasAttribute('lj-cmd')&&K.getAttribute('lj-cmd'))=='LJLike')J.state=B(K,t.config.useComputedState)==this.value?1:2;else if(!K||K.type!=1||K.getName()=='body'||K.getName()=='iframe')J.state=2;else J.state=B(K,t.config.useComputedState)==this.value?1:2;J.fire('state');};function D(I,J,K){var M=this;M.name=J;M.value=K;var L=I.config.justifyClasses;if(L){switch(K){case 'left':M.cssClassName=L[0];break;case 'center':M.cssClassName=L[1];break;case 'right':M.cssClassName=L[2];break;}M.cssClassRegex=new RegExp('(?:^|\\s+)(?:'+L.join('|')+')(?=$|\\s)');}};function E(I){var J=I.editor,K=new d.range(J.document);K.setStartBefore(I.data.node);K.setEndAfter(I.data.node);var L=new d.walker(K),M;while(M=L.next()){if(M.type==1){var N='text-align',O=J.config.justifyClasses;if(!M.equals(I.data.node)&&M.getDirection()){K.setStartAfter(M);L=new d.walker(K);continue;}if(O)if(M.hasClass(O[0])){M.removeClass(O[0]);M.addClass(O[2]);}else if(M.hasClass(O[2])){M.removeClass(O[2]);M.addClass(O[0]);}switch(M.getStyle(N)){case 'left':M.setStyle(N,'right');break;case 'right':M.setStyle(N,'left');break;}}}};D.prototype={exec:function(I){var W=this;var J=I.getSelection(),K=I.config.enterMode;
 if(!J)return;var L=J.createBookmarks();if(o.LJLike.node)o.LJLike.node.setAttribute('lj-style','text-align: '+W.value);else{var M=J.getRanges(true),N=W.cssClassName,O,P,Q=I.config.useComputedState;Q=Q===undefined||Q;for(var R=M.length-1;R>=0;R--){var S=M[R],T=S.getEnclosedNode();if(T&&T.is('iframe'))return;O=S.createIterator();O.enlargeBr=K!=2;while(P=O.getNextParagraph(K==1?'p':'div')){P.removeAttribute('align');P.removeStyle('text-align');var U=N&&(P.$.className=e.ltrim(P.$.className.replace(W.cssClassRegex,''))),V=W.state==2&&(!Q||B(P,true)!=W.value);if(N){if(V)P.addClass(N);else if(!U)P.removeAttribute('class');}else if(V)P.setStyle('text-align',W.value);}}}I.focus();I.forceNextSelectionCheck();J.selectBookmarks(L);}};var F=new D(t,'LJJustifyLeft','left'),G=new D(t,'LJJustifyCenter','center'),H=new D(t,'LJJustifyRight','right');t.addCommand('LJJustifyLeft',F);t.addCommand('LJJustifyCenter',G);t.addCommand('LJJustifyRight',H);t.ui.addButton('LJJustifyLeft',{label:t.lang.justify.left,command:'LJJustifyLeft'});t.ui.addButton('LJJustifyCenter',{label:t.lang.justify.center,command:'LJJustifyCenter'});t.ui.addButton('LJJustifyRight',{label:t.lang.justify.right,command:'LJJustifyRight'});t.on('selectionChange',e.bind(C,F));t.on('selectionChange',e.bind(C,H));t.on('selectionChange',e.bind(C,G));t.on('dirChanged',E);})();(function(){var B='LJPollLink';LiveJournal.register_hook('poll_response',function(C){var D=new Poll(C),E="<div class='lj-poll-inner lj-rtebox-inner'>"+D.outputHTML()+'</div>',F=D.outputLJtags(),G=o[B].node;if(G){G.setAttribute('lj-content',E);G.setAttribute('lj-data',F);G.removeAttribute('style');}else{G=new h('iframe',t.document);G.setAttribute('lj-content',E);G.setAttribute('lj-cmd','LJPollLink');G.setAttribute('lj-data',F);G.setAttribute('lj-class','lj-poll lj-rtebox');G.setAttribute('class','lj-poll-wrap');G.setAttribute('frameBorder',0);G.setAttribute('allowTransparency','true');t.insertElement(G);}y();});t.addCommand(B,{exec:function(C){var D=o.LJPollLink.node;if(D)LiveJournal.run_hook('rteButton','poll',jQuery('.cke_button_'+B),{ljData:decodeURIComponent(D.getAttribute('lj-data')),editMode:true,disabled:D&&(D.getAttribute('data-disabledPoll')?true:false)});else LiveJournal.run_hook('rteButton','poll',jQuery('.cke_button_'+B));},editorFocus:false});t.ui.addButton(B,{label:m.LJPoll_Title,command:B});})();(function(){var B='LJLike',C='like';n.defaultButtons=[];for(var D=0;D<n.length;D++){btn=n[D];n[btn.id]=n[btn.abbr]=btn;n.defaultButtons.push(btn.id);
 }LiveJournal.register_hook('like_response',function(E){var F=[],G=[],H=typeof E==='string';for(var I=0,J;I<n.length;I++){J=n[I];if(H&&J.checked||E.indexOf(J.id)!=-1){F.push(J.id);G.push(J.html);}}var K=o[B].node,L=encodeURIComponent('<div class="lj-rtebox-inner lj-like-inner"><span class="lj-like-wrapper">'+G.join('')+'</span></div>');if(K){K.setAttribute('buttons',F.join(','));K.setAttribute('lj-content',L);K.removeAttribute('defaults');}else{K=new h('iframe',t.document);K.setAttribute('lj-class','lj-like');K.setAttribute('class','lj-like-wrap lj-rtebox');K.setAttribute('buttons',F.join(','));K.setAttribute('lj-content',L);K.setAttribute('lj-cmd','LJLike');K.setAttribute('frameBorder',0);K.setAttribute('allowTransparency','true');K.setAttribute('defaults',H);t.insertElement(K);}y();});t.addCommand(B,{exec:function(E){var F=o[B].node;if(F)LiveJournal.run_hook('rteButton',C,jQuery('.cke_button_'+B),{buttons:F.getAttribute('buttons'),editMode:true});else LiveJournal.run_hook('rteButton',C,jQuery('.cke_button_'+B));},editorFocus:false});t.ui.addButton(B,{label:m.LJLike_Title,command:B});})();},afterInit:function(t){var u=t.dataProcessor;function v(w,x,y,z){z=z||'text';var A=new a.htmlParser.element('iframe');A.attributes['lj-class']=x+' '+x+'-open';A.attributes['class']=x+'-wrap';A.attributes['lj-cmd']=y;A.attributes.frameBorder=0;A.attributes.allowTransparency='true';if(w.attributes.hasOwnProperty(z))A.attributes.text=w.attributes[z];w.children.unshift(A);var B=new a.htmlParser.element('iframe');B.attributes['lj-class']=x+' '+x+'-close';B.attributes['class']=x+'-wrap';B.attributes.frameBorder=0;B.attributes.allowTransparency='true';w.children.push(B);delete w.name;};u.dataFilter.addRules({elements:{'lj-like':function(w){var x=[],y=new a.htmlParser.element('iframe');y.attributes['lj-class']='lj-like';y.attributes['class']='lj-like-wrap lj-rtebox';if(w.attributes.hasOwnProperty('style'))y.attributes['lj-style']=w.attributes.style;y.attributes['lj-cmd']='LJLike';y.attributes['lj-content']='<div class="lj-rtebox-inner lj-like-inner"><span class="lj-like-wrapper">';y.attributes.frameBorder=0;y.attributes.allowTransparency='true';var z=w.attributes.buttons&&w.attributes.buttons.split(',')||n.defaultButtons,A=w.attributes.buttons?true:false,B=z.length;for(var C=0;C<B;C++){var D=z[C].replace(/^\s*([a-z]{2,})\s*$/i,'$1'),E=n[D];if(E&&(A||E.checked)){y.attributes['lj-content']+=encodeURIComponent(E.html);x.push(D);}}if(!w.attributes.buttons)y.attributes.defaults=true;y.attributes['lj-content']+='</span></div>';

Modified: trunk/htdocs/js/ck/plugins/livejournal/plugin.js
===================================================================
--- trunk/htdocs/js/ck/plugins/livejournal/plugin.js	2012-08-03 14:00:42 UTC (rev 22569)
+++ trunk/htdocs/js/ck/plugins/livejournal/plugin.js	2012-08-03 14:28:31 UTC (rev 22570)
@@ -821,22 +821,28 @@
 						bodyStyle += 'height:' + (height - 2) + 'px;';
 					}
 
-					iframe.setAttributes({
-						'lj-url': text,
-						'class': 'lj-map-wrap lj-rtebox',
+					var node = ljTagsData[button].node;
+					if (node) {
+						node.setAttributes({
+							'lj-url': text
+						});
+					} else {
+						iframe.setAttributes({
+							'lj-url': text,
+							'class': 'lj-map-wrap lj-rtebox',
 
-						'lj-content': '<div class="lj-map-inner lj-rtebox-inner"><p class="lj-map">map</p></div>',
+							'lj-content': '<div class="lj-map-inner lj-rtebox-inner"><p class="lj-map">map</p></div>',
 
-						'lj-cmd': 'LJMap',
-						'lj-class': 'lj-map',
-						'frameborder': 0,
-						'allowTransparency': 'true',
+							'lj-cmd': 'LJMap',
+							'lj-class': 'lj-map',
+							'frameborder': 0,
+							'allowTransparency': 'true',
 
-						'style': frameStyle,
-						'lj-style': bodyStyle
-					});
-
-					editor.insertElement(iframe);
+							'style': frameStyle,
+							'lj-style': bodyStyle
+						});
+						editor.insertElement(iframe);
+					}
 					updateFrames();
 				});
 
@@ -845,7 +851,7 @@
 						var node = ljTagsData[button].node;
 
 						LiveJournal.run_hook('rteButton', widget, jQuery('.cke_button_' + button), {
-							defaultText: node ? node.getAttribute('text') : '',
+							defaultText: node ? node.getAttribute('lj-url') : '',
 							editMode: node? true : false
 						});
 					},

Tags: atyurin, js, livejournal, spacevillain
Subscribe
  • Post a new comment

    Error

    Anonymous comments are disabled in this journal

    default userpic

    Your reply will be screened

    Your IP address will be recorded 

  • 0 comments