Skip to content

Commit a70ebf7

Browse files
jackycutejackycute
committed
Update to move dropbox app key setting to common.js and will auto load client-side related scripts
1 parent a816420 commit a70ebf7

7 files changed

Lines changed: 39 additions & 43 deletions

File tree

‎README.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,7 @@ Third-party integration api key settings
123123
| ------- | --------- | ----------- |
124124
| facebook, twitter, github, dropbox | `config.json` | for signin |
125125
| imgur | `config.json` | for image upload |
126-
| dropbox | `public/views/foot.ejs` | for chooser and saver |
127-
| google drive | `public/js/common.js`/ `config.json` (enable) | for export and import |
126+
| google drive, dropbox | `public/js/common.js` | for export and import |
128127

129128

130129
Operational Transformation

‎lib/config.js‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ var twitter = config.twitter || false;
6161
var github = config.github || false;
6262
var dropbox = config.dropbox || false;
6363
var imgur = config.imgur || false;
64-
var googleDrive = config.googleDrive || false;
6564

6665
function getserverurl() {
6766
var url = '';
@@ -112,6 +111,5 @@ module.exports = {
112111
twitter: twitter,
113112
github: github,
114113
dropbox: dropbox,
115-
imgur: imgur,
116-
googleDrive: googleDrive,
114+
imgur: imgur
117115
};

‎lib/response.js‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,7 @@ function responseError(res, code, detail, msg) {
7272
code: code,
7373
detail: detail,
7474
msg: msg,
75-
useCDN: config.usecdn,
76-
googleDrive: config.googleDrive,
75+
useCDN: config.usecdn
7776
});
7877
res.write(content);
7978
res.end();
@@ -95,8 +94,7 @@ function showIndex(req, res, next) {
9594
facebook: config.facebook,
9695
twitter: config.twitter,
9796
github: config.github,
98-
dropbox: config.dropbox,
99-
googleDrive: config.googleDrive,
97+
dropbox: config.dropbox
10098
});
10199
res.write(content);
102100
res.end();
@@ -126,8 +124,7 @@ function responseHackMD(res, note) {
126124
facebook: config.facebook,
127125
twitter: config.twitter,
128126
github: config.github,
129-
dropbox: config.dropbox,
130-
googleDrive: config.googleDrive,
127+
dropbox: config.dropbox
131128
});
132129
var buf = html;
133130
res.writeHead(200, {

‎public/js/common.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@ var urlpath = ''; // sub url path, like: www.example.com/<urlpath>
44
//settings
55
var debug = false;
66

7-
var GOOGLE_API_KEY = 'change this';
8-
var GOOGLE_CLIENT_ID = 'change this';
7+
var GOOGLE_API_KEY = '';
8+
var GOOGLE_CLIENT_ID = '';
9+
10+
var DROPBOX_APP_KEY = '';
911

1012
var port = window.location.port;
1113
var serverurl = window.location.protocol + '//' + (domain ? domain : window.location.hostname) + (port ? ':' + port : '') + (urlpath ? '/' + urlpath : '');

‎public/js/index.js‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1048,6 +1048,35 @@ function showMessageModal(title, header, href, text, success) {
10481048
modal.modal('show');
10491049
}
10501050

1051+
// check if dropbox app key is set and load scripts
1052+
if (DROPBOX_APP_KEY) {
1053+
$('<script>')
1054+
.attr('type', 'text/javascript')
1055+
.attr('src', 'https://www.dropbox.com/static/api/2/dropins.js')
1056+
.attr('id', 'dropboxjs')
1057+
.attr('data-app-key', DROPBOX_APP_KEY)
1058+
.appendTo('body');
1059+
} else {
1060+
ui.toolbar.import.dropbox.hide();
1061+
ui.toolbar.export.dropbox.hide();
1062+
}
1063+
1064+
// check if google api key and client id are set and load scripts
1065+
if (GOOGLE_API_KEY && GOOGLE_CLIENT_ID) {
1066+
$('<script>')
1067+
.attr('type', 'text/javascript')
1068+
.attr('src', 'https://www.google.com/jsapi')
1069+
.appendTo('body');
1070+
1071+
$('<script>')
1072+
.attr('type', 'text/javascript')
1073+
.attr('src', 'https://apis.google.com/js/client:plusone.js?onload=onGoogleClientLoaded')
1074+
.appendTo('body');
1075+
} else {
1076+
ui.toolbar.import.googleDrive.hide();
1077+
ui.toolbar.export.googleDrive.hide();
1078+
}
1079+
10511080
//button actions
10521081
//share
10531082
ui.toolbar.publish.attr("href", noteurl + "/publish");

‎public/views/foot.ejs‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -71,20 +71,11 @@
7171
<script src="<%- url %>/vendor/md-toc.js" defer></script>
7272
<script src="<%- url %>/vendor/showup/showup.js" defer></script>
7373
<script src="<%- url %>/vendor/randomColor.js" defer></script>
74-
<% if(dropbox) { %>
75-
<script type="text/javascript" src="https://www.dropbox.com/static/api/2/dropins.js" id="dropboxjs" data-app-key="change this" async defer></script>
76-
<% } %>
77-
<% if(googleDrive) { %>
78-
<script src="https://www.google.com/jsapi" defer></script>
79-
<% } %>
8074
<script src="<%- url %>/js/google-drive-upload.js" defer></script>
8175
<script src="<%- url %>/js/google-drive-picker.js" defer></script>
8276
<script src="<%- url %>/js/common.js" defer></script>
8377
<script src="<%- url %>/js/extra.js" defer></script>
8478
<script src="<%- url %>/js/render.js" defer></script>
8579
<script src="<%- url %>/js/history.js" defer></script>
8680
<script src="<%- url %>/js/index.js" defer></script>
87-
<script src="<%- url %>/js/syncscroll.js" defer></script>
88-
<% if(googleDrive) { %>
89-
<script src="https://apis.google.com/js/client:plusone.js?onload=onGoogleClientLoaded" defer></script>
90-
<% } %>
81+
<script src="<%- url %>/js/syncscroll.js" defer></script>

‎public/views/header.ejs‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -33,31 +33,21 @@
3333
<li role="presentation"><a role="menuitem" class="ui-beta-slide" tabindex="-1" href="#" target="_blank"><i class="fa fa-tv fa-fw"></i> Slide Mode</a>
3434
</li>
3535
<li class="divider"></li>
36-
<% if((googleDrive == "true") || (typeof dropbox !== 'undefined' && dropbox) || (typeof github !== 'undefined' && github)) { %>
3736
<li class="dropdown-header">Export</li>
38-
<% if(typeof dropbox !== 'undefined' && dropbox) { %>
3937
<li role="presentation"><a role="menuitem" class="ui-save-dropbox" tabindex="-1" href="#" target="_self"><i class="fa fa-dropbox fa-fw"></i> Dropbox</a>
4038
</li>
41-
<% } %>
42-
<% if(googleDrive == "true") { %>
4339
<li role="presentation"><a role="menuitem" class="ui-save-google-drive" tabindex="-1" href="#" target="_self"><i class="fa fa-cloud-upload fa-fw"></i> Google Drive</a>
4440
</li>
45-
<% } %>
4641
<% if(typeof github !== 'undefined' && github) { %>
4742
<li role="presentation"><a role="menuitem" class="ui-save-gist" tabindex="-1" href="#" target="_blank"><i class="fa fa-github fa-fw"></i> Gist</a>
4843
</li>
4944
<% } %>
5045
<li class="divider"></li>
51-
<% } %>
5246
<li class="dropdown-header">Import</li>
53-
<% if(typeof dropbox !== 'undefined' && dropbox) { %>
5447
<li role="presentation"><a role="menuitem" class="ui-import-dropbox" tabindex="-1" href="#" target="_self"><i class="fa fa-dropbox fa-fw"></i> Dropbox</a>
5548
</li>
56-
<% } %>
57-
<% if(googleDrive == "true") { %>
5849
<li role="presentation"><a role="menuitem" class="ui-import-google-drive" tabindex="-1" href="#" target="_self"><i class="fa fa-cloud-download fa-fw"></i> Google Drive</a>
5950
</li>
60-
<% } %>
6151
<li role="presentation"><a role="menuitem" class="ui-import-gist" href="#" data-toggle="modal" data-target="#gistImportModal"><i class="fa fa-github fa-fw"></i> Gist</a>
6252
</li>
6353
<li role="presentation"><a role="menuitem" class="ui-import-clipboard" href="#" data-toggle="modal" data-target="#clipboardModal"><i class="fa fa-clipboard fa-fw"></i> Clipboard</a>
@@ -128,31 +118,21 @@
128118
<li role="presentation"><a role="menuitem" class="ui-beta-slide" tabindex="-1" href="#" target="_blank"><i class="fa fa-tv fa-fw"></i> Slide Mode</a>
129119
</li>
130120
<li class="divider"></li>
131-
<% if((googleDrive == "true") || (typeof dropbox !== 'undefined' && dropbox) || (typeof github !== 'undefined' && github)) { %>
132121
<li class="dropdown-header">Export</li>
133-
<% if(typeof dropbox !== 'undefined' && dropbox) { %>
134122
<li role="presentation"><a role="menuitem" class="ui-save-dropbox" tabindex="-1" href="#" target="_self"><i class="fa fa-dropbox fa-fw"></i> Dropbox</a>
135123
</li>
136-
<% } %>
137-
<% if(googleDrive == "true") { %>
138124
<li role="presentation"><a role="menuitem" class="ui-save-google-drive" tabindex="-1" href="#" target="_self"><i class="fa fa-cloud-upload fa-fw"></i> Google Drive</a>
139125
</li>
140-
<% } %>
141126
<% if(typeof github !== 'undefined' && github) { %>
142127
<li role="presentation"><a role="menuitem" class="ui-save-gist" tabindex="-1" href="#" target="_blank"><i class="fa fa-github fa-fw"></i> Gist</a>
143128
</li>
144129
<% } %>
145130
<li class="divider"></li>
146-
<% } %>
147131
<li class="dropdown-header">Import</li>
148-
<% if(typeof dropbox !== 'undefined' && dropbox) { %>
149132
<li role="presentation"><a role="menuitem" class="ui-import-dropbox" tabindex="-1" href="#" target="_self"><i class="fa fa-dropbox fa-fw"></i> Dropbox</a>
150133
</li>
151-
<% } %>
152-
<% if(googleDrive == "true") { %>
153134
<li role="presentation"><a role="menuitem" class="ui-import-google-drive" tabindex="-1" href="#" target="_self"><i class="fa fa-cloud-download fa-fw"></i> Google Drive</a>
154135
</li>
155-
<% } %>
156136
<li role="presentation"><a role="menuitem" class="ui-import-gist" href="#" data-toggle="modal" data-target="#gistImportModal"><i class="fa fa-github fa-fw"></i> Gist</a>
157137
</li>
158138
<li role="presentation"><a role="menuitem" class="ui-import-clipboard" href="#" data-toggle="modal" data-target="#clipboardModal"><i class="fa fa-clipboard fa-fw"></i> Clipboard</a>

0 commit comments

Comments
 (0)