summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYukai Huang2016-10-13 16:25:38 +0800
committerYukai Huang2016-10-13 16:25:38 +0800
commitd6003649337c2565e04132a58b42f7a520eb5037 (patch)
tree4b4adb8065ae1a1c77d16a92825a28faeef01314
parent229b947b093e0f88b587a00cfd256b38979c356e (diff)
Fix history deletion
-rw-r--r--public/js/cover.js1
-rw-r--r--public/js/history.js5
-rw-r--r--public/views/index.ejs4
3 files changed, 7 insertions, 3 deletions
diff --git a/public/js/cover.js b/public/js/cover.js
index 30a8e5c8..245127d1 100644
--- a/public/js/cover.js
+++ b/public/js/cover.js
@@ -17,6 +17,7 @@ var postHistoryToServer = historyModule.postHistoryToServer;
var deleteServerHistory = historyModule.deleteServerHistory;
var parseServerToHistory = historyModule.parseServerToHistory;
var saveStorageHistoryToServer = historyModule.saveStorageHistoryToServer;
+var clearDuplicatedHistory = historyModule.clearDuplicatedHistory;
var saveAs = require('file-saver').saveAs;
var List = require('list.js');
diff --git a/public/js/history.js b/public/js/history.js
index d5082dd9..8593bbcf 100644
--- a/public/js/history.js
+++ b/public/js/history.js
@@ -10,7 +10,7 @@ var extra = require('./extra');
var renderFilename = extra.renderFilename;
var md = extra.md;
-var migrateHistoryFromTempCallback = null;
+window.migrateHistoryFromTempCallback = null;
migrateHistoryFromTemp();
@@ -417,5 +417,6 @@ module.exports = {
postHistoryToServer: postHistoryToServer,
deleteServerHistory: deleteServerHistory,
parseServerToHistory: parseServerToHistory,
- saveStorageHistoryToServer: saveStorageHistoryToServer
+ saveStorageHistoryToServer: saveStorageHistoryToServer,
+ clearDuplicatedHistory: clearDuplicatedHistory
}
diff --git a/public/views/index.ejs b/public/views/index.ejs
index 0bc3dd50..e2894589 100644
--- a/public/views/index.ejs
+++ b/public/views/index.ejs
@@ -204,7 +204,9 @@
<script src="<%- url %>/vendor/velocity/velocity.min.js" defer></script>
<script src="<%- url %>/vendor/moment/min/moment-with-locales.min.js" defer></script>
<% } %>
- <script src="//ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js" defer></script>
+ <script src="//ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
+ <script src="//cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js"></script>
+ <script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" defer></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/lodash.js/4.16.4/lodash.min.js" defer></script>
<%- include build/cover-scripts %>
</body>