From 7e69bfc40b25f06618d1dbe744256e9a0d12280a Mon Sep 17 00:00:00 2001 From: Cheng-Han, Wu Date: Wed, 20 Apr 2016 18:20:43 +0800 Subject: Merge client index.js settings to common.js --- public/js/common.js | 4 ++++ public/js/index.js | 5 ----- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'public/js') 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/ +//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 = { -- cgit v1.2.3