--- a/src/widgets/Social.js Thu Jan 02 16:40:25 2014 +0100
+++ b/src/widgets/Social.js Thu Jan 02 16:49:20 2014 +0100
@@ -3,7 +3,7 @@
IriSP.Widgets.Social = function(player, config) {
IriSP.Widgets.Widget.call(this, player, config);
ZeroClipboard.setMoviePath( IriSP.getLib('zeroClipboardSwf') );
-};
+}
IriSP.Widgets.Social.prototype = new IriSP.Widgets.Widget();
@@ -15,14 +15,14 @@
show_fb: true,
show_gplus: true,
show_mail: true
-};
+}
IriSP.Widgets.Social.prototype.template =
- '<span class="Ldt-Social">{{#show_url}}<div class="Ldt-Social-Url-Container"><a href="#" draggable="true" target="_blank" class="Ldt-Social-Square Ldt-Social-Url Ldt-TraceMe" title="{{l10n.share_link}}">'
+ '<span class="Ldt-Social">{{#show_url}}<div class="Ldt-Social-Url-Container"><a href="#" target="_blank" class="Ldt-Social-Square Ldt-Social-Url Ldt-TraceMe" title="{{l10n.share_link}}">'
+ '</a><div class="Ldt-Social-UrlPop"><input class="Ldt-Social-Input"/><div class="Ldt-Social-CopyBtn">{{l10n.copy}}</div></div></div>{{/show_url}}'
- + '{{#show_fb}}<a href="#" target="_blank" class="Ldt-Social-Fb Ldt-Social-Ext Ldt-TraceMe" title="{{l10n.share_on}} Facebook"></a>{{/show_fb}}'
- + '{{#show_twitter}}<a href="#" target="_blank" class="Ldt-Social-Twitter Ldt-Social-Ext Ldt-TraceMe" title="{{l10n.share_on}} Twitter"></a>{{/show_twitter}}'
- + '{{#show_gplus}}<a href="#" target="_blank" class="Ldt-Social-Gplus Ldt-Social-Ext Ldt-TraceMe" title="{{l10n.share_on}} Google+"></a>{{/show_gplus}}'
+ + '{{#show_fb}}<a href="#" target="_blank" class="Ldt-Social-Fb Ldt-TraceMe" title="{{l10n.share_on}} Facebook"></a>{{/show_fb}}'
+ + '{{#show_twitter}}<a href="#" target="_blank" class="Ldt-Social-Twitter Ldt-TraceMe" title="{{l10n.share_on}} Twitter"></a>{{/show_twitter}}'
+ + '{{#show_gplus}}<a href="#" target="_blank" class="Ldt-Social-Gplus Ldt-TraceMe" title="{{l10n.share_on}} Google+"></a>{{/show_gplus}}'
+ '{{#show_mail}}<a href="#" target="_blank" class="Ldt-Social-Mail Ldt-TraceMe" title="{{l10n.share_mail}}"></a>{{/show_mail}}</span>';
IriSP.Widgets.Social.prototype.messages = {
@@ -38,7 +38,7 @@
share_link: "Share hypertext link",
copy: "Copy"
}
-};
+}
IriSP.Widgets.Social.prototype.draw = function() {
this.renderTemplate();
@@ -48,22 +48,12 @@
this.$.find(".Ldt-Social-Url").click(function() {
_this.toggleCopy();
return false;
- }).on("dragstart", function(e) {
- e.originalEvent.dataTransfer.setData("text/x-iri-title",_this.text);
- e.originalEvent.dataTransfer.setData("text/x-iri-uri",_this.url);
});
this.$.find(".Ldt-Social-Input").focus(function() {
this.select();
});
- this.$.find(".Ldt-Social-Ext").click(function() {
- window.open(
- IriSP.jQuery(this).attr("href"),
- "_blank",
- "height=300,width=450,left=100,top=100,toolbar=0,menubar=0,status=0,location=0");
- return false;
- });
this.updateUrls(this.url, this.text);
-};
+}
IriSP.Widgets.Social.prototype.toggleCopy = function() {
var _pop = this.$.find(".Ldt-Social-UrlPop");
@@ -85,13 +75,13 @@
} else {
this.clip.hide();
}
-};
+}
IriSP.Widgets.Social.prototype.updateUrls = function(_url, _text) {
this.url = _url;
this.text = _text;
this.$.find(".Ldt-Social-Fb").attr("href", "http://www.facebook.com/share.php?" + IriSP.jQuery.param({ u: _url, t: _text }));
this.$.find(".Ldt-Social-Twitter").attr("href", "https://twitter.com/intent/tweet?" + IriSP.jQuery.param({ url: _url, text: _text }));
- this.$.find(".Ldt-Social-Gplus").attr("href", "https://plus.google.com/share?" + IriSP.jQuery.param({ url: _url, title: _text }));
+ this.$.find(".Ldt-Social-Gplus").attr("href", "https://plusone.google.com/_/+1/confirm?" + IriSP.jQuery.param({ url: _url, title: _text }));
this.$.find(".Ldt-Social-Mail").attr("href", "mailto:?" + IriSP.jQuery.param({ subject: _text, body: _text + ": " + _url }));
-};
+}