Revert "Add https support to gplus using yandex as proxy"
This reverts commit fd885d1e44
.
Conflicts:
src/social-likes.js
master
parent
115e7db0af
commit
1be1381eb6
|
@ -118,12 +118,29 @@
|
||||||
popupHeight: 360
|
popupHeight: 360
|
||||||
},
|
},
|
||||||
plusone: {
|
plusone: {
|
||||||
counterUrl: 'https://share.yandex.net/counter/gpp/?url={url}&callback=?',
|
// HTTPS not supported yet: http://clubs.ya.ru/share/1499
|
||||||
convertNumber: function(number) {
|
counterUrl: isHttps ? undefined : 'http://share.yandex.ru/gpp.xml?url={url}',
|
||||||
if (typeof number === 'string') {
|
counter: function(jsonUrl, deferred) {
|
||||||
number = number.replace(/\D/g, '');
|
var options = services.plusone;
|
||||||
|
if (options._) {
|
||||||
|
// Reject all counters except the first because Yandex Share counter doesn’t return URL
|
||||||
|
deferred.reject();
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
return parseInt(number, 10);
|
|
||||||
|
if (!window.services) window.services = {};
|
||||||
|
window.services.gplus = {
|
||||||
|
cb: function(number) {
|
||||||
|
if (typeof number === 'string') {
|
||||||
|
number = number.replace(/\D/g, '');
|
||||||
|
}
|
||||||
|
options._.resolve(parseInt(number, 10));
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
options._ = deferred;
|
||||||
|
$.getScript(makeUrl(jsonUrl))
|
||||||
|
.fail(deferred.reject);
|
||||||
},
|
},
|
||||||
popupUrl: 'https://plus.google.com/share?url={url}',
|
popupUrl: 'https://plus.google.com/share?url={url}',
|
||||||
popupWidth: 700,
|
popupWidth: 700,
|
||||||
|
|
Loading…
Reference in New Issue