Merge branch 'develop' of git.dev.yoho.cn:web/yohood into develop

@@ -99,6 +99,8 @@ define('plugins/share', function(require, exports) {
                 name: "",
                 caption: ""
             };
+            var appid = "",
+                domain = document.domain;
             if (options.fbTextFunction != null) {
                 tmpResult = (function() {
                     return options.fbTextFunction.apply($(".yohoo-share-button-facebook"));
@@ -128,6 +130,25 @@ define('plugins/share', function(require, exports) {
                     .replace(/[&]/g, "%26")
                     .replace(/[#]/g, "%23")
                     .replace(/[+]/g, "%2B");
+                if (domain === "yohood.dev.yoho.cn") {
+                    appid = "146057275796393";
+                } else if (domain === "yohood.test.yoho.cn") {
+                    appid = "146057275796393";
+                } else if (domain === "www.yohood.cn") {
+                    appid = "146050529130401";
+                }
+                if (appid !== "") {
+                    window.open("http://www.facebook.com/dialog/feed?app_id=" + appid + 
+                        // "&redirect_uri=" + location.href +
+                        "&link=" + options.shareUrl +
+                        "&picture=" + options.img +
+                        "&caption=" + options.fbName +
+                        "&description=" + options.fbDescription + (options.fbDescription == "" ? "" : "") +
+                        "&name=" + options.fbCaption,
+                        "",
+                        "height=" + options.height + ",width=" + options.width + ",left=" + iLeft + ",top=" + iTop);
+                    return;
+                }
                 window.open("http://www.facebook.com/dialog/feed?app_id=1431491300468916&redirect_uri=http://www.yohoboys.com/channel/yohood/closedialog&" +
                     "link=" + options.shareUrl +
                     "&picture=" + options.img +
@@ -183,4 +204,4 @@ define('plugins/share', function(require, exports) {
     $(".enterprise").on("click.closeWxDialog", function() {
         $(".detail-container").trigger("click.closeWxDialog");
     })
-});
\ No newline at end of file
+});

@@ -584,13 +584,13 @@ define('yohood', function(require, exports) {
             share.init({
                 shareUrl: shareUrl,
                 img: shareCover,
-                sinaText: '【YO’HOOD 2016】' + detailTitle.text() + '\r\n' + detailSubtitle.text() + '@YOHO！潮流志',
+                sinaText: '【YO’HOOD 2016】' + detailTitle.text() + '\r\n' + detailSubtitle.text() + '@YOHO!潮流志',
                 fbTextFunction: function() {
                     return {
                         des: '【YO’HOOD 2016】' + detailTitle.text() + '\r\n' + detailSubtitle.text() + '#YO’HOOD 2016',
                         name: '【YO’HOOD 2016】' + detailTitle.text() + '\r\n' + detailSubtitle.text() + '#YO’HOOD 2016',
                         caption: '【YO’HOOD 2016】' + detailTitle.text() + '\r\n' + detailSubtitle.text() + '#YO’HOOD 2016',
-                        url: location.href
+                        // url:  location.href 
                     }
                 },
                 tweetText: '【YO’HOOD 2016】' + detailTitle.text() + '\r\n' + detailSubtitle.text(),
@@ -598,6 +598,8 @@ define('yohood', function(require, exports) {
             });
         }
 
+///   https://www.facebook.com/sharer/sharer.php?s=100&p[url]=http%3A%2F%2Fwww.sadtrombone.com%2F&p[title]=Sad+Trombon&p[summary]=Another+way+to+share%25via+Facebook&p[images][0]=http%3A%2F%2Fwww.sadtrombone.com%2Fimages%2FsadtromboneLogo.pnghttp%3A%2F%2Fyohood.dev.yoho.cn%2Fnews%2Fdetail%2Fid%2F208     
+
         //详情页图片滚动
         if ($('.detail-slide').size() > 0) {
             //slide大图上的左右箭头显示