Fix scripts load order to prevent reference error, using query callback to prevent google api call before loaded

This commit is contained in:
Wu Cheng-Han 2016-09-18 16:27:21 +08:00
parent 0470a266fd
commit c22791610c

View file

@ -1242,6 +1242,8 @@ if (DROPBOX_APP_KEY) {
.attr('src', 'https://www.dropbox.com/static/api/2/dropins.js')
.attr('id', 'dropboxjs')
.attr('data-app-key', DROPBOX_APP_KEY)
.prop('async', true)
.prop('defer', true)
.appendTo('body');
} else {
ui.toolbar.import.dropbox.hide();
@ -1252,18 +1254,24 @@ if (DROPBOX_APP_KEY) {
if (GOOGLE_API_KEY && GOOGLE_CLIENT_ID) {
$('<script>')
.attr('type', 'text/javascript')
.attr('src', 'https://www.google.com/jsapi')
.appendTo('body');
$('<script>')
.attr('type', 'text/javascript')
.attr('src', 'https://apis.google.com/js/client:plusone.js?onload=onGoogleClientLoaded')
.attr('src', 'https://www.google.com/jsapi?callback=onGoogleAPILoaded')
.prop('async', true)
.prop('defer', true)
.appendTo('body');
} else {
ui.toolbar.import.googleDrive.hide();
ui.toolbar.export.googleDrive.hide();
}
function onGoogleAPILoaded() {
$('<script>')
.attr('type', 'text/javascript')
.attr('src', 'https://apis.google.com/js/client:plusone.js?onload=onGoogleClientLoaded')
.prop('async', true)
.prop('defer', true)
.appendTo('body');
}
//button actions
//share
ui.toolbar.publish.attr("href", noteurl + "/publish");