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

libs -> libraries

don't use hash in non minjs version
Henry Oswald 8 лет назад
Родитель
Сommit
490c56c692

+ 3 - 2
services/web/Gruntfile.coffee

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

+ 1 - 1
services/web/app/coffee/infrastructure/ExpressLocals.coffee

@@ -43,7 +43,7 @@ pathList = [
 	["#{jsPath}libs/require.js"]
 	["#{jsPath}libs/require.js"]
 	["#{jsPath}ide.js"]
 	["#{jsPath}ide.js"]
 	["#{jsPath}main.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}#{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.js"]
 	["#{jsPath}libs/#{pdfjs}/pdf.worker.js"]
 	["#{jsPath}libs/#{pdfjs}/pdf.worker.js"]

+ 1 - 0
services/web/app/views/layout.pug

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

+ 2 - 1
services/web/app/views/project/editor.pug

@@ -132,7 +132,8 @@ block requirejs
 				"pdfjs-dist/build/pdf.worker": "#{pdfWorkerPath}",
 				"pdfjs-dist/build/pdf.worker": "#{pdfWorkerPath}",
 				"ace": "#{lib('ace')}",
 				"ace": "#{lib('ace')}",
 				"fineuploader": "libs/#{lib('fineuploader')}",
 				"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,
 			"waitSeconds": 0,
 			"shim": {
 			"shim": {

+ 1 - 1
services/web/public/coffee/base.coffee

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

+ 0 - 0
services/web/public/coffee/libs.coffee → services/web/public/coffee/libraries.coffee


+ 1 - 1
services/web/public/coffee/utils/underscore.coffee

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