summaryrefslogtreecommitdiff
path: root/public/js
diff options
context:
space:
mode:
authorCheng-Han, Wu2016-04-20 18:20:43 +0800
committerCheng-Han, Wu2016-04-20 18:20:43 +0800
commit7e69bfc40b25f06618d1dbe744256e9a0d12280a (patch)
tree1a2ed171c7d90160f809c1691b9abc619d7feb15 /public/js
parentcf003c32993d765726ad9de68f29365c0caf2026 (diff)
Merge client index.js settings to common.js
Diffstat (limited to 'public/js')
-rw-r--r--public/js/common.js4
-rw-r--r--public/js/index.js5
2 files changed, 4 insertions, 5 deletions
diff --git a/public/js/common.js b/public/js/common.js
index 799c9581..3cdc7487 100644
--- a/public/js/common.js
+++ b/public/js/common.js
@@ -1,6 +1,8 @@
//common
var domain = 'change this'; // domain name
var urlpath = ''; // sub url path, like: www.example.com/<urlpath>
+//settings
+var debug = false;
var GOOGLE_API_KEY = 'change this';
var GOOGLE_CLIENT_ID = 'change this';
@@ -10,6 +12,8 @@ var serverurl = window.location.protocol + '//' + domain + (port ? ':' + port :
var noteid = urlpath ? window.location.pathname.slice(urlpath.length + 1, window.location.pathname.length).split('/')[1] : window.location.pathname.split('/')[1];
var noteurl = serverurl + '/' + noteid;
+var version = '0.3.4';
+
var checkAuth = false;
var profile = null;
var lastLoginState = getLoginState();
diff --git a/public/js/index.js b/public/js/index.js
index ca99d8c9..295ff4ba 100644
--- a/public/js/index.js
+++ b/public/js/index.js
@@ -1,8 +1,3 @@
-//constant vars
-//settings
-var debug = false;
-var version = '0.3.4';
-
var defaultTextHeight = 20;
var viewportMargin = 20;
var defaultExtraKeys = {