From 0fca629c34b83617b2d72e42aa0edb66fd2e71f6 Mon Sep 17 00:00:00 2001 From: Yukai Huang Date: Fri, 13 Jan 2017 22:51:44 +0800 Subject: [PATCH] Rename common.js to login.js --- public/js/cover.js | 2 +- public/js/extra.js | 2 +- public/js/history.js | 8 ++++++-- public/js/index.js | 7 +++++-- public/js/{common.js => lib/common/login.js} | 2 +- 5 files changed, 14 insertions(+), 7 deletions(-) rename public/js/{common.js => lib/common/login.js} (98%) diff --git a/public/js/cover.js b/public/js/cover.js index 677d82e..bc04923 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 6cfb5b0..b651d9e 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 f120168..34b2cba 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 660f73e..3bf42ad 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 similarity index 98% rename from public/js/common.js rename to public/js/lib/common/login.js index 9a60122..12cc41f 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;