spacevillain (spacevillain) wrote in changelog,
spacevillain
spacevillain
changelog

[livejournal] r22977: LJSUP-13434: Iframe inscription

Committer: atyurin
LJSUP-13434: Iframe inscription
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-09-26 11:49:21 UTC (rev 22976)
+++ trunk/htdocs/js/ck/ckeditor.js	2012-09-26 11:56:15 UTC (rev 22977)
@@ -139,7 +139,7 @@
 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='LJImage';G.setAttribute('lj-cmd',N);}else if(G.is('a')&&!O.hasAttribute('lj:user')){N='LJLink2';G.setAttribute('lj-cmd',N);}}if(N&&p.hasOwnProperty(N)){if(E){p[N].node=G;t.getCommand(N).setState(1);}(C||(C={}))[N]={content:p[N].html,node:G};}}while(G=G.getParent());var P;if(E)for(H in p){if(p.hasOwnProperty(H)&&(!C||!C.hasOwnProperty(H))){delete p[H].node;P=t.getCommand(H);if(P)P.setState(2);}}};(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(c){t.document.getBody().on('dragend',y);t.document.getBody().on('paste',function(){setTimeout(y,0);});}if(!Site.page.disabled_input){t.document.on('click',z);t.document.on('mouseover',z);t.document.getBody().on('keyup',w);y();}});(function(){var B='LJFont',C=t.config,D=false,E={},F='normal',G=C.LJFontDefault,H=C.LJFontSize,I=C.LJFontStyle,J='b-fontsize-select-item-active',K,L,M,N,O=jQuery();for(N in H){E[N]=new a.style(I,{size:H[N]});E[N]._.definition.name=N;}function P(Q){G=Q;O.removeClass(J).filter('.b-fontsize-select-item-'+G).addClass(J);};t.addCommand(B,{exec:function(Q){Q.rteButton(B,'font');if(!D){O=jQuery('.b-fontsize-select-item');LiveJournal.register_hook('font_response',function(S){Q.focus();Q.fire('saveSnapshot');var T=E[S],U,V,W;if(G===S)T.remove(Q.document);else{V=Q.getSelection();W=parseFloat(T._.definition.styles['font-size']);for(U in E)E[U].remove(Q.document);T.apply(Q.document);}Q.fire('saveSnapshot');});D=true;var R=Q.getCommand(B);R.setState(1);P(G);}}});t.ui.addButton(B,{label:m[B],command:B});t.on('selectionChange',function(Q){var R=Q.data.path,S=R.elements,T=t.getCommand(B),U,V,W;for(U=0;U<S.length;U++){V=S[U];for(W in E){if(E[W].checkElementRemovable(V,true)){if(W!==G){P(W);T.setState(1);}return;}}}P(F);T.setState(2);});})();(function(){var B='LJImage',C=null;LiveJournal.register_hook('editpic_response',function(D){var E=C,F=E&&E.getParent();if(!E)return;if(D.url){E.setAttribute('src',D.url);E.setAttribute('data-cke-saved-src',D.url);}else{if(F&&F.getName()==='a')F.remove();else E.remove();return;}if(D.width)E.setAttribute('width',D.width);else E.removeAttribute('width');if(D.height)E.setAttribute('height',D.height);else E.removeAttribute('height');if(D.title)E.setAttribute('title',D.title);else E.removeAttribute('title');if(D.border)E.setStyle('border-width',D.border+'px');
 else{E.removeStyle('border-width');E.removeStyle('border-style');}if(D.vspace)E.setStyles({'margin-top':D.vspace+'px','margin-bottom':D.vspace+'px'});else{E.removeStyle('margin-top');E.removeStyle('margin-bottom');}if(D.hspace)E.setStyles({'margin-left':D.hspace+'px','margin-right':D.hspace+'px'});else{E.removeStyle('margin-left');E.removeStyle('margin-right');}var F=E&&E.getParent();if(D.link){D.link=D.link.replace(/^[\s\t]*(?:http:\/\/)?/,'http://');if(F&&F.getName()==='a'){F.setAttribute('href',D.link);F.setAttribute('data-cke-saved-href',D.link);if(D.blank)F.setAttribute('target','_blank');else F.removeAttribute('target');}else{var G=new h('a',t.document);G.setAttribute('href',D.link);if(D.blank)G.setAttribute('target','_blank');E.insertBeforeMe(G);G.append(E);t.getSelection()&&t.getSelection().selectElement(G);}}else if(F.getName()==='a'){F.insertBeforeMe(E);F.remove();}if(D.aligment&&D.aligment!=='none')E.setStyle('float',D.aligment);else E.removeStyle('float');C=null;});t.addCommand(B,{exec:function(D,E){var F=D.getSelection();F=F?F.getSelectedElement():null;C=F;if(F){var G=F&&F.getParent(),H=G.getName()==='a',I=H&&G,J=H&&G.getAttribute('href'),K={};if('naturalWidth' in F.$){K.width=F.$.naturalWidth;K.height=F.$.naturalHeight;}else{var L=new Image();L.src=F.$.src;K={width:L.width,height:L.height};}D.rteButton(B,'editpic',{picData:{url:F.getAttribute('src'),title:F.getAttribute('title'),width:F.getAttribute('width')||F.$.width,height:F.getAttribute('height')||F.$.height,defaultWidth:K.width,defaultHeight:K.height,link:J||'',blank:H?!!I.getAttribute('target'):true,border:parseInt(F.getStyle('border-width'),10),vspace:parseInt(F.getStyle('margin-top'),10),hspace:parseInt(F.getStyle('margin-left'),10),aligment:F.getStyle('float')||'none'}});}else jQuery('.b-updatepage-event-section').editor('handleImageUpload','upload');},editorFocus:false});t.ui.addButton(B,{label:m.LJImage_Title,command:B});})();(function(){var B=null;t.on('selectionChange',function(F){var G=F.data.element;if(G.is('iframe'))B=G;else B=null;});var C='LJEmbedLink',D='video';function E(F){var G=new h('iframe',t.document);if(F!==LiveJournal.getEmbed(F)){var H=h.createFromHtml(LiveJournal.getEmbed(F)),I='',J=LiveJournal.parseMediaLink(F);if(J.preview)I='style="background-image: url('+J.preview+');"';G.setAttribute('lj-url',H.getAttribute('src'));G.setAttribute('data-link',F);G.setAttribute('lj-class','lj-iframe');G.setAttribute('class','lj-iframe-wrap lj-rtebox');G.setAttribute('style','width: 490px; height:370px;');
-G.setAttribute('lj-style','width: 480px; height:360px;');G.setAttribute('allowfullscreen','true');G.setAttribute('lj-content',encodeURIComponent('<div '+I+" class='lj-embed-inner lj-rtebox-inner'>iframe</div>"));}else{G.setAttribute('lj-class','lj-embed');G.setAttribute('class','lj-embed-wrap lj-rtebox');G.setAttribute('lj-content',encodeURIComponent('<div '+I+" class='lj-embed-inner lj-rtebox-inner'>Embed</div>"));}G.setAttribute('lj-data',encodeURIComponent(LiveJournal.getEmbed(F)));G.setAttribute('frameBorder',0);G.setAttribute('allowTransparency','true');G.setAttribute('lj-cmd',C);t.insertElement(G);y();};LiveJournal.register_hook(D+'_response',function(F){E(F);});t.addCommand(C,{exec:function(F){var G=p[C].node||B;if(G)n(C,D,{defaultText:G&&decodeURIComponent(G.getAttribute('data-link')||G.getAttribute('lj-url')||G.getAttribute('lj-data')),editMode:true});else n(C,D);}});t.ui.addButton(C,{label:m.LJEmbed,command:C});})();function A(B,C,D){var E,F=p[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();}};(function(){var B='LJMap',C='map';LiveJournal.register_hook('map_response',function(D){var E=new h('iframe',t.document),F=425,G=350,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=p[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});
+G.setAttribute('lj-style','width: 480px; height:360px;');G.setAttribute('allowfullscreen','true');G.setAttribute('lj-content',encodeURIComponent('<div '+I+" class='lj-embed-inner lj-rtebox-inner'>"+(I?'':'iframe')+'</div>'));}else{G.setAttribute('lj-class','lj-embed');G.setAttribute('class','lj-embed-wrap lj-rtebox');G.setAttribute('lj-content',encodeURIComponent('<div '+I+" class='lj-embed-inner lj-rtebox-inner'>Embed</div>"));}G.setAttribute('lj-data',encodeURIComponent(LiveJournal.getEmbed(F)));G.setAttribute('frameBorder',0);G.setAttribute('allowTransparency','true');G.setAttribute('lj-cmd',C);t.insertElement(G);y();};LiveJournal.register_hook(D+'_response',function(F){E(F);});t.addCommand(C,{exec:function(F){var G=p[C].node||B;if(G)n(C,D,{defaultText:G&&decodeURIComponent(G.getAttribute('data-link')||G.getAttribute('lj-url')||G.getAttribute('lj-data')),editMode:true});else n(C,D);}});t.ui.addButton(C,{label:m.LJEmbed,command:C});})();function A(B,C,D){var E,F=p[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();}};(function(){var B='LJMap',C='map';LiveJournal.register_hook('map_response',function(D){var E=new h('iframe',t.document),F=425,G=350,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=p[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=p[B].node;n(B,C,{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=p[B].node;n(B,C,{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=p[B].node;n(B,C,{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=p.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(p.LJLike.node)p.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.type===1&&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';if(!LJ.pageVar('remoteUser',true))return;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=p[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=p.LJPollLink.node;if(D)n(B,'poll',{ljData:decodeURIComponent(D.getAttribute('lj-data')),editMode:true,disabled:D&&(D.getAttribute('data-disabledPoll')?true:false)});else n(B,'poll');
 },editorFocus:false});t.ui.addButton(B,{label:m.LJPoll_Title,command:B});})();(function(){var B='LJLike',C='like';o.defaultButtons=[];for(var D=0;D<o.length;D++){btn=o[D];o[btn.id]=o[btn.abbr]=btn;o.defaultButtons.push(btn.id);}LiveJournal.register_hook('like_response',function(E){var F=[],G=[],H=typeof E==='string';for(var I=0,J;I<o.length;I++){J=o[I];if(H&&J.checked||E.indexOf(J.id)!=-1){F.push(J.id);G.push(J.html);}}var K=p[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=p[B].node;if(F)n(B,C,{buttons:F.getAttribute('buttons'),editMode:true});else n(B,C);},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(',')||o.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=o[D];if(E&&(A||E.checked)){y.attributes['lj-content']+=encodeURIComponent(E.html);

Modified: trunk/htdocs/js/ck/plugins/livejournal/plugin.js
===================================================================
--- trunk/htdocs/js/ck/plugins/livejournal/plugin.js	2012-09-26 11:49:21 UTC (rev 22976)
+++ trunk/htdocs/js/ck/plugins/livejournal/plugin.js	2012-09-26 11:56:15 UTC (rev 22977)
@@ -1010,7 +1010,7 @@
 						iframe.setAttribute('style', "width: 490px; height:370px;");
 						iframe.setAttribute('lj-style', "width: 480px; height:360px;");
 						iframe.setAttribute('allowfullscreen', 'true');
-						iframe.setAttribute('lj-content', encodeURIComponent("<div " + background + " class='lj-embed-inner lj-rtebox-inner'>iframe</div>"));
+						iframe.setAttribute('lj-content', encodeURIComponent("<div " + background + " class='lj-embed-inner lj-rtebox-inner'>" + (background ? "" : "iframe") + "</div>"));
 					} else {
 						iframe.setAttribute('lj-class', 'lj-embed');
 						iframe.setAttribute('class', 'lj-embed-wrap lj-rtebox');

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