Merge branch 'master', remote branch 'official/master'

tamoot · Mar 10, 2012 · 9d70e8a · 9d70e8a
2 parents d79dd3d + a927d49
commit 9d70e8a
Show file tree

Hide file tree

Showing 16 changed files with 52 additions and 349 deletions.
diff --git a/doc/ja/plugin/account_ad.txt b/doc/ja/plugin/account_ad.txt
diff --git a/js/jquery.socialbutton.js b/js/jquery.socialbutton.js
@@ -7,7 +7,7 @@
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  * 
- * Version: 1.8.0
+ * Version: 1.8.1
  */
 
 /**
@@ -152,12 +152,12 @@
  * $('#google').socialbutton('google_plusone');
  * 
  * $('#google').socialbutton('google_plusone', {
+ *     button: 'standard', // synonym 'size'
+ *     url: 'http://itra.jp', // synonym 'href'
  *     lang: 'ja',
  *     parsetags: 'explicit',
  *     callback: 'some_callback_function',
- *     count: true,
+ *     count: true
- *     href: 'http://itra.jp/',
- *     size: 'standard'
  * });
  * 
  */
@@ -268,12 +268,12 @@ $.fn.socialbutton = function(service, options) {
 			padding: 7
 		},
 		google_plusone: {
+			button: '', // small, standard, medium, tall
+			url: '',
 			lang: '', // en-US
 			parsetags: '', // none(onload), explicit
 			callback: '',
-			count: true, // true, false
+			count: true // true, false
-			href: '',
-			size: '' // small, standard, medium, tall
 		}
 	};
 
@@ -655,7 +655,7 @@ function socialbutton_hatena(target, options, defaults, index, max_index)
 	});
 
 	var tag = '<a' + attr + '><img src="http://b.st-hatena.com/images/entry-button/button-only.gif" alt="このエントリーをはてなブックマークに追加" width="20" height="20" style="border: none;" /></a>'
-			+ '<script type="text/javascript" src="http://b.st-hatena.com/js/bookmark_button.js" charset="utf-8" async="async"></script>';
+			+ '<script type="text/javascript" src="http://b.st-hatena.com/js/bookmark_button_wo_al.js" charset="utf-8" async="async"></script>';
 
 	$(target).html(tag);
 }
@@ -684,13 +684,14 @@ function socialbutton_google_plusone(target, options, defaults, index, max_index
 		return;
 	}
 
+	var size = options.size || options.button || defaults.button;
+	var href = options.href || options.url || defaults.url;
+
 	var lang = options.lang || defaults.lang;
 	var parsetags = options.parsetags || defaults.parsetags;
 
 	var callback = options.callback || defaults.callback;
 	var count = options.count != undefined ? options.count : defaults.count;
-	var href = options.href || defaults.href;
-	var size = options.size || defaults.size;
 
 	switch (size) {
 		case 'small':
@@ -731,7 +732,7 @@ function socialbutton_google_plusone(target, options, defaults, index, max_index
 			script_params = '{' + script_params + '}';
 		}
 
-		if (typeof gapi === "undefined" || typeof gapi.plusone === "undefined") {
+		if (typeof gapi === 'undefined' || typeof gapi.plusone === 'undefined') {
 			$('body').append('<script type="text/javascript" src="https://apis.google.com/js/plusone.js">' + script_params + '</script>');
 		} else {
 			gapi.plusone.go();

diff --git a/plugin/account_ad.rb b/plugin/account_ad.rb
diff --git a/plugin/section_footer2.rb b/plugin/section_footer2.rb
@@ -56,7 +56,7 @@ def init_buttons_status
 
 add_header_proc do
   <<-"EOS"
-  <script type="text/javascript" src="http://b.st-hatena.com/js/bookmark_button.js" charset="utf-8" async="async"></script>
+  <script type="text/javascript" src="http://b.st-hatena.com/js/bookmark_button_wo_al.js" charset="utf-8" async="async"></script>
   <style type="text/css">iframe.hatena-bookmark-button-frame {margin-bottom: -7px; }</style>
   <script src="http://platform.twitter.com/widgets.js" type="text/javascript"></script>
   <style type="text/css">iframe.twitter-share-button.twitter-count-horizontal {margin-bottom: -6px; }</style>

diff --git a/plugin/zh/account_ad.rb b/plugin/zh/account_ad.rb
diff --git a/plugin/zh/add_bookmark.rb b/plugin/zh/add_bookmark.rb
diff --git a/plugin/zh/del_footer.rb b/plugin/zh/del_footer.rb
diff --git a/plugin/zh/livedoor_weather.rb b/plugin/zh/livedoor_weather.rb
diff --git a/plugin/zh/nicovideo.rb b/plugin/zh/nicovideo.rb
diff --git a/plugin/zh/openid.rb b/plugin/zh/openid.rb