Skip to content

Commit 682f708

Browse files
author
unknown
committed
Configured minimization, linked some files unminimized due to errors with compression, fixes #12
1 parent 62ea2c3 commit 682f708

File tree

4 files changed

+11
-9
lines changed

4 files changed

+11
-9
lines changed

javascript-console-share/pom.xml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@
221221
<!-- com.googlecode.jslint4java:jslint4java-maven-plugin would be a better / more configurable jslint plugin -->
222222
<!-- com.samaxes.maven:minify-maven-plugin would be a better compressor, but requires Java 7 and min-suffix pattern is non-standard for
223223
Alfresco -->
224-
<!--
224+
225225
<plugin>
226226
<groupId>net.alchim31.maven</groupId>
227227
<artifactId>yuicompressor-maven-plugin</artifactId>
@@ -231,7 +231,6 @@
231231
<id>Check and Minify JS</id>
232232
<phase>process-resources</phase>
233233
<goals>
234-
<goal>jslint</goal>
235234
<goal>compress</goal>
236235
</goals>
237236
<configuration>
@@ -240,14 +239,17 @@
240239
<outputDirectory>${project.build.directory}/${project.build.finalName}</outputDirectory>
241240
<excludes>
242241
<exclude>WEB-INF/**/*</exclude>
242+
<exclude>**/jshint_fme.js</exclude>
243+
<exclude>**/ambiance.css</exclude>
244+
<exclude>**/solarized.css</exclude>
243245
</excludes>
244246
<excludeResources>true</excludeResources>
245247
<excludeWarSourceDirectory>true</excludeWarSourceDirectory>
246248
</configuration>
247249
</execution>
248250
</executions>
249251
</plugin>
250-
-->
252+
251253
</plugins>
252254

253255
<pluginManagement>

javascript-console-share/src/main/amp/config/alfresco/site-webscripts/de/fme/components/jsconsole/javascript-console.get.head.ftl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747

4848

4949
<!-- lint addons-->
50-
<@script type="text/javascript" src="${page.url.context}/res/fme/components/jsconsole/jshint/jshint_fme.js"></@script>
50+
<script type="text/javascript" src="${page.url.context}/res/fme/components/jsconsole/jshint/jshint_fme.js"></script>
5151
<@script type="text/javascript" src="${page.url.context}/res/fme/components/jsconsole/jsonlint/jsonlint.js"></@script>
5252
<@script type="text/javascript" src="${page.url.context}/res/fme/components/jsconsole/jsonlint/json-formatter.js"></@script>
5353
<@link rel="stylesheet" media="screen" type="text/css" href="${page.url.context}/res/fme/components/jsconsole/codemirror/addon/lint/lint.css" />
@@ -86,8 +86,8 @@
8686
<!-- codemirror extension for ternjs by angelo zerr-->
8787
<@link rel="stylesheet" media="screen" type="text/css" href="${page.url.context}/res/fme/components/jsconsole/codemirror/addon/tern/tern-extension.css" />
8888
<@script type="text/javascript" src="${page.url.context}/res/fme/components/jsconsole/codemirror/addon/tern/tern-extension.js"></@script>
89-
<@script type="text/javascript" src="${page.url.context}/res/fme/components/jsconsole/codemirror/addon/tern/defs/ecma5.json.js"></@script>
90-
<@script type="text/javascript" src="${page.url.context}/res/fme/components/jsconsole/codemirror/addon/tern/defs/alfresco.json.js"></@script>
89+
<@script type="text/javascript" src="${page.url.context}/res/fme/components/jsconsole/codemirror/addon/tern/defs/ecma5-json.js"></@script>
90+
<@script type="text/javascript" src="${page.url.context}/res/fme/components/jsconsole/codemirror/addon/tern/defs/alfresco-json.js"></@script>
9191
<@script type="text/javascript" src="${page.url.context}/res/fme/components/jsconsole/codemirror/addon/tern/defs/alfresco-webscripts-tern.js"></@script>
9292
<@script type="text/javascript" src="${page.url.context}/res/fme/components/jsconsole/codemirror/addon/tern/defs/alfresco-batchprocessing-tern.js"></@script>
9393

@@ -106,11 +106,11 @@
106106
<@link rel="stylesheet" type="text/css" href="${page.url.context}/res/fme/components/jsconsole/codemirror/theme/monokai.css" />
107107
<@link rel="stylesheet" type="text/css" href="${page.url.context}/res/fme/components/jsconsole/codemirror/theme/cobalt.css" />
108108
<@link rel="stylesheet" type="text/css" href="${page.url.context}/res/fme/components/jsconsole/codemirror/theme/eclipse.css" />
109-
<@link rel="stylesheet" type="text/css" href="${page.url.context}/res/fme/components/jsconsole/codemirror/theme/rubyblue.css" />
109+
<link rel="stylesheet" type="text/css" href="${page.url.context}/res/fme/components/jsconsole/codemirror/theme/rubyblue.css" />
110110
<@link rel="stylesheet" type="text/css" href="${page.url.context}/res/fme/components/jsconsole/codemirror/theme/lesser-dark.css" />
111111
<@link rel="stylesheet" type="text/css" href="${page.url.context}/res/fme/components/jsconsole/codemirror/theme/xq-dark.css" />
112112
<@link rel="stylesheet" type="text/css" href="${page.url.context}/res/fme/components/jsconsole/codemirror/theme/ambiance.css" />
113113
<@link rel="stylesheet" type="text/css" href="${page.url.context}/res/fme/components/jsconsole/codemirror/theme/blackboard.css" />
114114
<@link rel="stylesheet" type="text/css" href="${page.url.context}/res/fme/components/jsconsole/codemirror/theme/vibrant-ink.css" />
115-
<@link rel="stylesheet" type="text/css" href="${page.url.context}/res/fme/components/jsconsole/codemirror/theme/solarized.css" />
115+
<link rel="stylesheet" type="text/css" href="${page.url.context}/res/fme/components/jsconsole/codemirror/theme/solarized.css" />
116116
<@link rel="stylesheet" type="text/css" href="${page.url.context}/res/fme/components/jsconsole/codemirror/theme/twilight.css" />
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
var def = {
33

44
"!name": "alfresco",
5-
"companyHome": {
5+
"companyhome": {
66
"!type": "ScriptNode",
77
"!doc": "The company home ScriptNode. See ScriptNode API for properties and methods." },
88
"document": {
File renamed without changes.

0 commit comments

Comments
 (0)