summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYukai Huang2017-01-13 22:51:44 +0800
committerYukai Huang2017-01-13 23:06:31 +0800
commit0fca629c34b83617b2d72e42aa0edb66fd2e71f6 (patch)
tree10cb832e1349c1eee884b2f9234b83b47a1a8684
parentc2a8911b9c7872ea0d085020aa17e82162130f3d (diff)
Rename common.js to login.js
-rw-r--r--public/js/cover.js2
-rw-r--r--public/js/extra.js2
-rw-r--r--public/js/history.js8
-rw-r--r--public/js/index.js7
-rw-r--r--public/js/lib/common/login.js (renamed from public/js/common.js)2
5 files changed, 14 insertions, 7 deletions
diff --git a/public/js/cover.js b/public/js/cover.js
index 677d82eb..bc04923b 100644
--- a/public/js/cover.js
+++ b/public/js/cover.js
@@ -9,7 +9,7 @@ import {
getLoginState,
resetCheckAuth,
setloginStateChangeEvent
-} from './common';
+} from './lib/common/login';
import {
clearDuplicatedHistory,
diff --git a/public/js/extra.js b/public/js/extra.js
index 6cfb5b0a..b651d9e6 100644
--- a/public/js/extra.js
+++ b/public/js/extra.js
@@ -11,7 +11,7 @@ import PDFObject from 'pdfobject';
import S from 'string';
import { saveAs } from 'file-saver';
-require('./common');
+require('./lib/common/login');
require('../vendor/md-toc');
var Viz = require("viz.js");
diff --git a/public/js/history.js b/public/js/history.js
index f1201683..34b2cba7 100644
--- a/public/js/history.js
+++ b/public/js/history.js
@@ -1,9 +1,13 @@
import store from 'store';
import S from 'string';
+
+import {
+ checkIfAuth
+} from './lib/common/login';
+
import {
- checkIfAuth,
urlpath
-} from './common';
+} from './lib/config';
window.migrateHistoryFromTempCallback = null;
diff --git a/public/js/index.js b/public/js/index.js
index 660f73e4..3bf42ad4 100644
--- a/public/js/index.js
+++ b/public/js/index.js
@@ -19,7 +19,10 @@ var List = require('list.js');
import {
checkLoginStateChanged,
- setloginStateChangeEvent,
+ setloginStateChangeEvent
+} from './lib/common/login';
+
+import {
debug,
DROPBOX_APP_KEY,
GOOGLE_API_KEY,
@@ -28,7 +31,7 @@ import {
noteurl,
urlpath,
version
-} from './common';
+} from './lib/config';
import {
autoLinkify,
diff --git a/public/js/common.js b/public/js/lib/common/login.js
index 9a60122b..12cc41fc 100644
--- a/public/js/common.js
+++ b/public/js/lib/common/login.js
@@ -1,4 +1,4 @@
-import { serverurl } from './lib/config';
+import { serverurl } from '../config';
let checkAuth = false;
let profile = null;