Procházet zdrojové kódy

move template-checker to src/lib/util

Yuki Takei před 7 roky
rodič
revize
5bc544c2f9

+ 1 - 1
src/client/js/components/PageList/PageListMeta.js

@@ -1,5 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import templateChecker from '@commons/util/template-checker';
 
 export default class PageListMeta extends React.Component {
 
@@ -14,7 +15,6 @@ export default class PageListMeta extends React.Component {
   render() {
     // TODO isPortal()
     const page = this.props.page;
-    const templateChecker = require('@server/util/templateChecker');
 
     // portal check
     let PortalLabel;

+ 0 - 0
src/server/util/templateChecker.js → src/lib/util/template-checker.js


+ 0 - 1
src/server/crowi/index.js

@@ -38,7 +38,6 @@ function Crowi(rootdir, env) {
   this.mailer = {};
   this.passportService = null;
   this.globalNotificationService = null;
-
   this.interceptorManager = new InterceptorManager();
   this.xss = new Xss();
 

+ 4 - 4
src/server/models/page.js

@@ -12,10 +12,10 @@ class UserHasNoGrantException {
 }
 
 module.exports = function(crowi) {
-  var debug = require('debug')('growi:models:page')
+  const debug = require('debug')('growi:models:page')
     , mongoose = require('mongoose')
     , escapeStringRegexp = require('escape-string-regexp')
-    , templateChecker = require('../util/templateChecker')
+    , templateChecker = require('@commons/util/template-checker')
     , ObjectId = mongoose.Schema.Types.ObjectId
     , GRANT_PUBLIC = 1
     , GRANT_RESTRICTED = 2
@@ -30,9 +30,9 @@ module.exports = function(crowi) {
     , STATUS_DEPRECATED = 'deprecated'
 
     , pageEvent = crowi.event('page')
+  ;
 
-    , pageSchema
-    , Comment = crowi.model('Comment');
+  let pageSchema;
 
   function isPortalPath(path) {
     if (path.match(/.*\/$/)) {