Просмотр исходного кода

remove changes from view templates

Ryu Sato 5 лет назад
Родитель
Сommit
822d38fdcc

+ 0 - 1
src/client/js/services/PageContainer.js

@@ -75,7 +75,6 @@ export default class PageContainer extends Container {
       templateTagData: mainContent.getAttribute('data-template-tags') || null,
       shareLinksNumber: mainContent.getAttribute('data-share-links-number'),
       shareLinkId: JSON.parse(mainContent.getAttribute('data-share-link-id') || null),
-      compareRevisionIds: JSON.parse(mainContent.getAttribute('data-compare-revision-ids') || null),
 
       // latest(on remote) information
       remoteRevisionId: revisionId,

+ 3 - 10
src/server/routes/page.js

@@ -225,13 +225,12 @@ module.exports = function(crowi, app) {
     }
   }
 
-  function addRenderVarsForPage(renderVars, page, compareRevisionIds = []) {
+  function addRenderVarsForPage(renderVars, page) {
     renderVars.page = page;
     renderVars.revision = page.revision;
     renderVars.pageIdOnHackmd = page.pageIdOnHackmd;
     renderVars.revisionHackmdSynced = page.revisionHackmdSynced;
     renderVars.hasDraftOnHackmd = page.hasDraftOnHackmd;
-    renderVars.compareRevisionIds = compareRevisionIds;
 
     if (page.creator != null) {
       renderVars.page.creator = renderVars.page.creator.toObject();
@@ -365,7 +364,6 @@ module.exports = function(crowi, app) {
   async function showPageForGrowiBehavior(req, res, next) {
     const path = getPathFromRequest(req);
     const revisionId = req.query.revision;
-    const compare = req.query.compare;
     const layoutName = configManager.getConfig('crowi', 'customize:layout');
 
     let page = await Page.findByPathAndViewer(path, req.user);
@@ -395,11 +393,9 @@ module.exports = function(crowi, app) {
       page = await page.seen(req.user);
     }
 
-    const compareRevisionIds = compare ? compare.split('...') : [];
-
     // populate
     page = await page.populateDataToShowRevision();
-    addRenderVarsForPage(renderVars, page, compareRevisionIds);
+    addRenderVarsForPage(renderVars, page);
     addRenderVarsForScope(renderVars, page);
 
     await addRenderVarsForSlack(renderVars, page);
@@ -456,7 +452,6 @@ module.exports = function(crowi, app) {
   actions.showSharedPage = async function(req, res, next) {
     const { linkId } = req.params;
     const revisionId = req.query.revision;
-    const compare = req.query.compare;
 
     const layoutName = configManager.getConfig('crowi', 'customize:layout');
 
@@ -490,11 +485,9 @@ module.exports = function(crowi, app) {
 
     page.initLatestRevisionField(revisionId);
 
-    const compareRevisionIds = compare ? compare.split('...') : [];
-
     // populate
     page = await page.populateDataToShowRevision();
-    addRenderVarsForPage(renderVars, page, compareRevisionIds);
+    addRenderVarsForPage(renderVars, page);
     addRenderVarsForScope(renderVars, page);
 
     await interceptorManager.process('beforeRenderPage', req, res, renderVars);

+ 0 - 1
src/server/views/widget/page_content.html

@@ -29,7 +29,6 @@
   data-page-count-of-seen-users="{{ page.seenUsers.length|default(0) }}"
   data-share-links-number="{% if page %}{{ sharelinksNumber }}{% endif %}"
   data-share-link-id="{% if sharelink %}{{ sharelink._id|json }}{% endif %}"
-  data-compare-revision-ids="{% if compareRevisionIds %}{{ compareRevisionIds|json }}{% else %}null{% endif %}"
   >
 {% else %}
 <div id="content-main" class="content-main d-flex"