libs -> libraries

don't use hash in non minjs version
This commit is contained in:
Henry Oswald 2017-12-13 17:07:58 +00:00
parent 716b309208
commit 490c56c692
7 changed files with 9 additions and 6 deletions

View file

@ -205,11 +205,12 @@ module.exports = (grunt) ->
modules: [
{
name: "main",
exclude: ["libraries"]
}, {
name: "ide",
exclude: ["pdfjs-dist/build/pdf"]
exclude: ["pdfjs-dist/build/pdf", "libraries"]
},{
name: "libs"
name: "libraries"
},{
name: "ace/mode-latex"
},{

View file

@ -43,7 +43,7 @@ pathList = [
["#{jsPath}libs/require.js"]
["#{jsPath}ide.js"]
["#{jsPath}main.js"]
["#{jsPath}libs.js"]
["#{jsPath}libraries.js"]
["#{jsPath}#{ace}/ace.js","#{jsPath}#{ace}/mode-latex.js","#{jsPath}#{ace}/worker-latex.js","#{jsPath}#{ace}/snippets/latex.js"]
["#{jsPath}libs/#{pdfjs}/pdf.js"]
["#{jsPath}libs/#{pdfjs}/pdf.worker.js"]

View file

@ -144,6 +144,7 @@ html(itemscope, itemtype='http://schema.org/Product')
"moment": "libs/#{lib('moment')}",
"fineuploader": "libs/#{lib('fineuploader')}",
"main": "#{buildJsPath('main.js', {hashedPath:settings.useMinifiedJs, fingerprint:false, removeExtension:true})}",
"libraries": "#{buildJsPath('libraries.js', {hashedPath:settings.useMinifiedJs, fingerprint:false, removeExtension:true})}",
},
"config":{
"moment":{

View file

@ -132,7 +132,8 @@ block requirejs
"pdfjs-dist/build/pdf.worker": "#{pdfWorkerPath}",
"ace": "#{lib('ace')}",
"fineuploader": "libs/#{lib('fineuploader')}",
"ide": "#{buildJsPath('ide.js', {hashedPath:true, fingerprint:false, removeExtension:true})}"
"ide": "#{buildJsPath('ide.js', {hashedPath:settings.useMinifiedJs, fingerprint:false, removeExtension:true})}",
"libraries": "#{buildJsPath('libraries.js', {hashedPath:settings.useMinifiedJs, fingerprint:false, removeExtension:true})}",
},
"waitSeconds": 0,
"shim": {

View file

@ -1,5 +1,5 @@
define [
"libs"
"libraries"
"modules/recursionHelper"
"modules/errorCatcher"
"modules/localStorage"

View file

@ -1,5 +1,5 @@
define [
"libs"
"libraries"
], () ->
angular.module('underscore', []).factory '_', ->
return window._