CCM NG: Restructing JavaScript parts

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@5676 8810af33-2d31-482b-a856-94f89814c4df

Former-commit-id: d3a35c8905
pull/2/head
jensp 2018-08-16 18:54:18 +00:00
parent fd77bb8468
commit 5821f22a7e
1687 changed files with 3666 additions and 3811 deletions

File diff suppressed because it is too large Load Diff

View File

@ -5,13 +5,18 @@
"build": "webpack" "build": "webpack"
}, },
"dependencies": { "dependencies": {
"ccm-cms-js": "7.0.0" "ccm-cms-pagemodelseditor": "7.0.0",
"ccm-cms-tinymce": "7.0.0",
"tinymce": "^4.8.2"
}, },
"devDependencies": { "devDependencies": {
"ts-loader": "^4.3.0", "@types/tinymce": "^4.5.16",
"tslint": "^5.10.0", "@types/webpack-env": "^1.13.6",
"typescript": "^2.8.3", "file-loader": "^1.1.11",
"webpack": "^4.8.1", "ts-loader": "^4.4.2",
"webpack-cli": "^2.1.3" "tslint": "^5.11.0",
"typescript": "^3.0.1",
"webpack": "^4.16.4",
"webpack-cli": "^3.1.0"
} }
} }

View File

@ -38,10 +38,20 @@
<artifactId>requirejs-domready</artifactId> <artifactId>requirejs-domready</artifactId>
<version>2.0.1-2</version> <version>2.0.1-2</version>
</dependency> </dependency>
<dependency> <!-- <dependency>
<groupId>org.librecms</groupId> <groupId>org.librecms</groupId>
<artifactId>ccm-cms-js</artifactId> <artifactId>ccm-cms-js</artifactId>
<version>7.0.0-SNAPSHOT</version> <version>7.0.0-SNAPSHOT</version>
</dependency> -->
<dependency>
<groupId>org.librecms</groupId>
<artifactId>ccm-cms-pagemodelseditor</artifactId>
<version>7.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.librecms</groupId>
<artifactId>ccm-cms-tinymce</artifactId>
<version>7.0.0-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>
@ -56,7 +66,7 @@
<directory>${project.build.directory}/generated-resources</directory> <directory>${project.build.directory}/generated-resources</directory>
</resource> </resource>
</resources> </resources>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
@ -85,10 +95,10 @@
<goal>install-node-and-npm</goal> <goal>install-node-and-npm</goal>
</goals> </goals>
<configuration> <configuration>
<nodeVersion>v8.11.1</nodeVersion> <nodeVersion>v8.11.4</nodeVersion>
</configuration> </configuration>
</execution> </execution>
<!--<execution> <!-- <execution>
<id>npm link ccm-pagemodelseditor</id> <id>npm link ccm-pagemodelseditor</id>
<goals> <goals>
<goal>npm</goal> <goal>npm</goal>
@ -96,8 +106,26 @@
<configuration> <configuration>
<arguments>link ccm-pagemodelseditor</arguments> <arguments>link ccm-pagemodelseditor</arguments>
</configuration> </configuration>
</execution>--> </execution> -->
<execution> <execution>
<id>npm link ccm-cms-pagemodelseditor</id>
<goals>
<goal>npm</goal>
</goals>
<configuration>
<arguments>link ccm-cms-pagemodelseditor</arguments>
</configuration>
</execution>
<execution>
<id>npm link ccm-cms-tinymce</id>
<goals>
<goal>npm</goal>
</goals>
<configuration>
<arguments>link ccm-cms-tinymce</arguments>
</configuration>
</execution>
<!--<execution>
<id>npm link ccm-cms-js</id> <id>npm link ccm-cms-js</id>
<goals> <goals>
<goal>npm</goal> <goal>npm</goal>
@ -105,7 +133,7 @@
<configuration> <configuration>
<arguments>link ccm-cms-js</arguments> <arguments>link ccm-cms-js</arguments>
</configuration> </configuration>
</execution> </execution>-->
<execution> <execution>
<id>npm install</id> <id>npm install</id>
<goals> <goals>
@ -128,7 +156,7 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId> <artifactId>maven-war-plugin</artifactId>
<configuration> <configuration>
<webResources> <webResources>
<resource> <resource>
<directory>src/main/resources</directory> <directory>src/main/resources</directory>
@ -137,7 +165,7 @@
<directory>${project.build.directory}/generated-resources</directory> <directory>${project.build.directory}/generated-resources</directory>
</resource> </resource>
</webResources> </webResources>
<overlays> <overlays>
<overlay> <overlay>
<groupId>org.libreccm</groupId> <groupId>org.libreccm</groupId>

View File

@ -0,0 +1 @@
import "ccm-cms-pagemodelseditor";

View File

@ -0,0 +1,32 @@
import * as tinymce from "tinymce";
import "tinymce/themes/modern/theme";
import "tinymce/plugins/code";
import "tinymce/plugins/lists";
import "tinymce/plugins/nonbreaking";
import "tinymce/plugins/noneditable";
import "tinymce/plugins/paste";
import "tinymce/plugins/searchreplace";
import "tinymce/plugins/table";
import "tinymce/plugins/template";
import "tinymce/plugins/visualblocks";
import "tinymce/plugins/wordcount";
import "ccm-cms-tinymce";
// Atom IDE reports an error here, but thats not correct. The Typescript
// compiler uses the definitions from @types/webext-env automatically.
require.context(
"file-loader?name=[path][name].[ext]"
+ "&context=node_modules/tinymce!tinymce/skins",
true,
/.*/,
);
tinymce.init({
//menubar: "tools",
plugins: "code insert-media lists nonbreaking noneditable paste searchreplace table template visualblocks wordcount",
selector: ".tinymce",
//toolbar: "code",
});

Some files were not shown because too many files have changed in this diff Show More