Changeset 1126

Timestamp:

04/30/09 10:31:13 (14 years ago)

Author:

Tomtom33

Message:

dcWikipedia 0.2.1 :

• Fixed bug with hreflang flag to support language changes

Location:

plugins/dcWikipedia

Files:

• _define.php (modified) (1 diff)
• js/popup.js (modified) (1 diff)
• js/popup.min.js (modified) (1 diff)
• js/post.js (modified) (3 diffs)
• js/post.min.js (modified) (3 diffs)
• popup.php (modified) (1 diff)

plugins/dcWikipedia/_define.php

@@ -15 +15 @@
           /* Description*/         "Search, find and link any word or expression on Wikipedia",
           /* Author */             "Tomtom (http://blog.zenstyle.fr)",
-          /* Version */            '0.2',
+          /* Version */            '0.2.1',
           /* Permissions */        'usage'
 );

plugins/dcWikipedia/js/popup.js

@@ -30 +30 @@
                     data.dcWikipediaUri = $("input[name='dcwikipedia_uri']:checked").val();
                     data.dcWikipediaValue = $("input[name='dcwikipedia_value']").val();
+                    data.dcWikipediaLang = $("input[name='dcwikipedia_lang']").val();
 
                     tb.elements.dcWikipedia.fncall[tb.mode].call(tb);

plugins/dcWikipedia/js/popup.min.js

@@ -3 +3 @@
 {var insert_form=$('#dcwikipedia-insert-form').get(0);if(insert_form==undefined){return;}
 var tb=window.opener.the_toolbar;var data=tb.elements.dcWikipedia.data;if($("input[name='dcwikipedia_uri']:checked").val().length>0)
-{data.dcWikipediaUri=$("input[name='dcwikipedia_uri']:checked").val();data.dcWikipediaValue=$("input[name='dcwikipedia_value']").val();tb.elements.dcWikipedia.fncall[tb.mode].call(tb);window.close();}});$('#lang').parent().toggleWithLegend($('#lang'),{});$($('#lang').get(0)).change(function(){$('#dcwikipedia-lang-form').submit();});});
+{data.dcWikipediaUri=$("input[name='dcwikipedia_uri']:checked").val();data.dcWikipediaValue=$("input[name='dcwikipedia_value']").val();data.dcWikipediaLang=$("input[name='dcwikipedia_lang']").val();tb.elements.dcWikipedia.fncall[tb.mode].call(tb);window.close();}});$('#lang').parent().toggleWithLegend($('#lang'),{});$($('#lang').get(0)).change(function(){$('#dcwikipedia-lang-form').submit();});});

plugins/dcWikipedia/js/post.js

@@ -87 +87 @@
                if (dcWikipedia.option.langFlag == 'yes')
                {
-                    res += 'hreflang="'+$('#post_lang').val()+'"';
+                    res += 'hreflang="'+d.dcWikipediaLang+'"';
                }
                res += '>';
@@ -120 +120 @@
                if (dcWikipedia.option.langFlag == 'yes')
                {
-                    res += '|'+$('#post_lang').val();
+                    res += '|'+d.dcWikipediaLang;
                }
                res += ']';
@@ -179 +179 @@
      a.setAttribute('titel',this.elements.dcWikipedia.data.dcWikipediaValue);
 
-     if (dcWikipedia.option.langFlag == 'yes') a.setAttribute('hreflang',$('#post_lang').val());
+     if (dcWikipedia.option.langFlag == 'yes') a.setAttribute('hreflang',d.dcWikipediaLang);
 
      a.appendChild(n);

plugins/dcWikipedia/js/post.min.js

@@ -8 +8 @@
 {var d=this.data;var res='';if(d.dcWikipediaValue!='0')
 {res+='<a href="'+d.dcWikipediaUri+'" class="dcwikipedia" title="'+d.dcWikipediaValue+'" ';if(dcWikipedia.option.langFlag=='yes')
-{res+='hreflang="'+$('#post_lang').val()+'"';}
+{res+='hreflang="'+d.dcWikipediaLang+'"';}
 res+='>';}
 res+=d.dcWikipediaValue;if(d.dcWikipediaValue!='0')
@@ -17 +17 @@
 res+=d.dcWikipediaValue;if(d.dcWikipediaValue!='0')
 {res+='|'+d.dcWikipediaUri;if(dcWikipedia.option.langFlag=='yes')
-{res+='|'+$('#post_lang').val();}
+{res+='|'+d.dcWikipediaLang;}
 res+=']';}
 return res;}};jsToolBar.prototype.elements.dcWikipedia.fn.wiki=function()
@@ -27 +27 @@
 {var html=this.elements.dcWikipedia.gethtml();this.encloseSelection('','',function()
 {return html;});};jsToolBar.prototype.elements.dcWikipedia.fncall.wysiwyg=function()
-{var n=this.getSelectedNode();var a=this.iwin.document.createElement('a');a.href=this.elements.dcWikipedia.data.dcWikipediaUri;a.setAttribute('class','dcwikipedia');a.setAttribute('titel',this.elements.dcWikipedia.data.dcWikipediaValue);if(dcWikipedia.option.langFlag=='yes')a.setAttribute('hreflang',$('#post_lang').val());a.appendChild(n);this.insertNode(a);};
+{var n=this.getSelectedNode();var a=this.iwin.document.createElement('a');a.href=this.elements.dcWikipedia.data.dcWikipediaUri;a.setAttribute('class','dcwikipedia');a.setAttribute('titel',this.elements.dcWikipedia.data.dcWikipediaValue);if(dcWikipedia.option.langFlag=='yes')a.setAttribute('hreflang',d.dcWikipediaLang);a.appendChild(n);this.insertNode(a);};

plugins/dcWikipedia/popup.php

@@ -76 +76 @@
      echo
      '<input type="hidden" name="dcwikipedia_value" value="'.$value.'" />'.
+     '<input type="hidden" name="dcwikipedia_lang" value="'.$lang.'" />'.
      '</form>'.
      '<p><a class="button" href="#" id="dcwikipedia-insert-cancel">'.__('cancel').'</a> - '.