Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Orion Editor Dependency #105

Merged
merged 1 commit into from Aug 31, 2017
Merged

Fix Orion Editor Dependency #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions org.eclipse.winery.repository.ui/.angular-cli.json
View file
Open in desktop
Expand Up @@ -21,12 +21,12 @@
"css/bootstrap.min.css",
"css/wineryCommon.css",
"css/wineryRepository.css",
"../build/built-editor.css",
"../build/orion/built-editor.css",
"../node_modules/ng2-toastr/ng2-toastr.css",
"../node_modules/font-awesome/css/font-awesome.css"
],
"scripts": [
"../build/built-editor.min.js"
"../build/orion/built-editor.min.js"
],
"environmentSource": "environments/environment.ts",
"environments": {
Expand Down
53 changes: 26 additions & 27 deletions org.eclipse.winery.repository.ui/package.json
View file
Open in desktop
Expand Up @@ -18,49 +18,48 @@
"author": "",
"license": "EPL-1.0, Apache License 2.0",
"dependencies": {
"@angular/animations": "4.3.0",
"@angular/common": "4.3.0",
"@angular/compiler": "4.3.0",
"@angular/core": "4.3.0",
"@angular/forms": "4.3.0",
"@angular/http": "4.3.0",
"@angular/platform-browser": "4.3.0",
"@angular/platform-browser-dynamic": "4.3.0",
"@angular/platform-server": "4.3.0",
"@angular/router": "4.3.0",
"core-js": "2.4.1",
"@angular/animations": "4.3.5",
"@angular/common": "4.3.5",
"@angular/compiler": "4.3.5",
"@angular/core": "4.3.5",
"@angular/forms": "4.3.5",
"@angular/http": "4.3.5",
"@angular/platform-browser": "4.3.5",
"@angular/platform-browser-dynamic": "4.3.5",
"@angular/router": "4.3.5",
"core-js": "2.5.0",
"font-awesome": "4.7.0",
"ngx-bootstrap": "1.7.1",
"ng2-file-upload": "1.2.0",
"ngx-pagination": "3.0.1",
"ng2-select": "1.2.0",
"ng2-table": "1.3.2",
"ng2-toastr": "4.0.1",
"ngx-bootstrap": "1.8.1",
"ngx-pagination": "3.0.1",
"reflect-metadata": "0.1.10",
"rxjs": "5.4.2",
"rxjs": "5.4.3",
"spinkit": "1.2.5",
"zone.js": "0.8.12"
"zone.js": "0.8.16"
},
"devDependencies": {
"@angular/cli": "1.3.0",
"@angular/compiler-cli": "4.3.0",
"@angular/language-service": "4.3.0",
"@angular/cli": "1.3.1",
"@angular/compiler-cli": "4.3.5",
"@angular/language-service": "4.3.5",
"@types/jasmine": "2.5.53",
"@types/jasminewd2": "2.0.2",
"@types/node": "6.0.60",
"@types/node": "8.0.24",
"codelyzer": "3.1.2",
"jasmine-core": "2.6.2",
"jasmine-spec-reporter": "4.1.0",
"jasmine-core": "2.7.0",
"jasmine-spec-reporter": "4.2.1",
"karma": "1.7.0",
"karma-chrome-launcher": "2.1.1",
"karma-chrome-launcher": "2.2.0",
"karma-cli": "1.0.1",
"karma-coverage-istanbul-reporter": "1.2.1",
"karma-coverage-istanbul-reporter": "1.3.0",
"karma-jasmine": "1.1.0",
"karma-jasmine-html-reporter": "0.2.2",
"protractor": "5.1.2",
"ts-node": "3.0.4",
"tslint": "5.3.2",
"typedoc": "0.7.1",
"typescript": "2.4.1"
"ts-node": "3.3.0",
"tslint": "5.6.0",
"typedoc": "0.8.0",
"typescript": "2.4.2"
}
}
18 changes: 3 additions & 15 deletions org.eclipse.winery.repository.ui/pom.xml
View file
Open in desktop
Expand Up @@ -50,21 +50,9 @@
<goal>wget</goal>
</goals>
<configuration>
<url>http://www.eclipse.org/orion/editor/releases/current/built-editor.min.js</url>
<outputFileName>built-editor.min.js</outputFileName>
<outputDirectory>${project.basedir}/build/</outputDirectory>
</configuration>
</execution>
<execution>
<phase>generate-resources</phase>
<id>download-orion-editor-styles</id>
<goals>
<goal>wget</goal>
</goals>
<configuration>
<url>http://www.eclipse.org/orion/editor/releases/current/built-editor.css</url>
<outputFileName>built-editor.css</outputFileName>
<outputDirectory>${project.basedir}/build/</outputDirectory>
<url>http://www.mirrorservice.org/sites/download.eclipse.org/eclipseMirror/orion/drops/R-8.0-201502161823/built-editor.zip</url>
<unpack>true</unpack>
<outputDirectory>${project.basedir}/build/orion</outputDirectory>
</configuration>
</execution>
</executions>
Expand Down
9 changes: 5 additions & 4 deletions ...winery.repository.ui/src/app/instance/sharedComponents/interfaces/interfaces.component.ts
View file
Open in desktop
Expand Up @@ -363,12 +363,13 @@ export class InterfacesComponent implements OnInit {
}

private handleGeneratedArtifact(response: Response) {
const message = 'It\'s available for download at ' +
'<a style="color: black;" href="' + response.headers.get('Location') + '">'
+ this.implementation.name
+ ' source</a>.';
this.generating = false;
this.generateImplModal.hide();
this.notify.success(
'It\'s available for download at <a style="color: black;" href="' + response.headers.get('Location') + '">' + this.implementation.name + ' source</a>.',
'Successfully created Artifact!',
{ enableHTML: true });
this.notify.success(message, 'Successfully created Artifact!', { enableHTML: true });
}

// endregion
Expand Down
4 changes: 2 additions & 2 deletions org.eclipse.winery.repository.ui/src/app/wineryEditorModule/wineryEditor.component.ts
View file
Open in desktop
Expand Up @@ -55,7 +55,7 @@ declare var requirejs: any;
})
export class WineryEditorComponent implements ControlValueAccessor, OnInit {

@Input() dataEditorLang: any = 'application/xml';
@Input() dataEditorLang = 'application/xml';
@Input() height = 500;

loading = true;
Expand All @@ -74,7 +74,7 @@ export class WineryEditorComponent implements ControlValueAccessor, OnInit {

ngOnInit() {
requirejs(['orion/editor/edit'], function (edit: any) {
this.orionEditor = edit({ className: 'editor', parent: 'xml' })[0];
this.orionEditor = edit({ className: 'editor', parent: 'xml', contentType: this.dataEditorLang })[0];
this.orionEditor.setText(this.innerValue);
}.bind(this));
}
Expand Down
50 changes: 24 additions & 26 deletions org.eclipse.winery.workflowmodeler/package.json
View file
Open in desktop
Expand Up @@ -20,45 +20,43 @@
}
],
"dependencies": {
"@angular/animations": "4.3.0",
"@angular/common": "4.3.0",
"@angular/compiler": "4.3.0",
"@angular/core": "4.3.0",
"@angular/forms": "4.3.0",
"@angular/http": "4.3.0",
"@angular/platform-browser": "4.3.0",
"@angular/platform-browser-dynamic": "4.3.0",
"@angular/platform-server": "4.3.0",
"@angular/router": "4.3.0",
"@angular/animations": "4.3.5",
"@angular/common": "4.3.5",
"@angular/compiler": "4.3.5",
"@angular/core": "4.3.5",
"@angular/forms": "4.3.5",
"@angular/http": "4.3.5",
"@angular/platform-browser": "4.3.5",
"@angular/platform-browser-dynamic": "4.3.5",
"@angular/router": "4.3.5",
"angular-in-memory-web-api": "0.3.2",
"angular2-uuid": "1.1.1",
"bootstrap": "4.0.0-alpha.6",
"core-js": "2.4.1",
"bootstrap": "3.3.7",
"core-js": "2.5.0",
"font-awesome": "4.7.0",
"jsplumb": "2.3.6",
"jsplumb": "2.4.3",
"moment": "2.18.1",
"rxjs": "5.4.2",
"zone.js": "0.8.12"
"rxjs": "5.4.3",
"zone.js": "0.8.16"
},
"devDependencies": {
"@angular/cli": "1.3.0",
"@angular/compiler-cli": "4.3.0",
"@angular/cli": "1.3.1",
"@angular/compiler-cli": "4.3.5",
"@types/core-js": "0.9.36",
"@types/jasmine": "2.5.46",
"@types/jquery": "2.0.41",
"@types/node": "7.0.0",
"@types/jasmine": "2.5.53",
"@types/node": "8.0.24",
"angular2-template-loader": "0.6.2",
"codelyzer": "3.1.2",
"jasmine-core": "2.6.4",
"jasmine-spec-reporter": "4.1.1",
"jasmine-core": "2.7.0",
"jasmine-spec-reporter": "4.2.1",
"karma": "1.7.0",
"karma-chrome-launcher": "2.1.1",
"karma-chrome-launcher": "2.2.0",
"karma-cli": "1.0.1",
"karma-coverage-istanbul-reporter": "1.2.1",
"karma-coverage-istanbul-reporter": "1.3.0",
"karma-jasmine": "1.1.0",
"karma-jasmine-html-reporter": "0.2.2",
"protractor": "5.1.2",
"tslint": "5.4.3",
"typescript": "2.4.1"
"tslint": "5.6.0",
"typescript": "2.4.2"
}
}
1 change: 1 addition & 0 deletions org.eclipse.winery.workflowmodeler/tsconfig.json
View file
Open in desktop
Expand Up @@ -9,6 +9,7 @@
"removeComments": false,
"noImplicitAny": false,
"suppressImplicitAnyIndexErrors": true,
"skipLibCheck": true,
"typingOptions": {
"enableAutoDiscovery": false,
"include": [],
Expand Down