[no-issue] downgrade scss bundle and some other minor fix (#2824)

* downgrade scss bundle and some other minor fix

* 2.0.9

* remove chrome in travis conf

* execute different configuration
This commit is contained in:
Eugenio Romano
2018-01-12 13:23:17 +00:00
committed by GitHub
parent d5b17c14e2
commit f6cf036769
5 changed files with 23 additions and 41 deletions

View File

@@ -1,6 +1,6 @@
language: node_js
dist: trusty
sudo: false
sudo: required
node_js:
- "8"
@@ -8,8 +8,9 @@ addons:
chrome: stable
before_install:
- "export DISPLAY=:99.0"
- "sh -e /etc/init.d/xvfb start"
- export CHROME_BIN=chromium-browser
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
env:
matrix:
@@ -31,7 +32,7 @@ install:
script:
- if ([ "$MODULE" == "core" ]); then
(./scripts/npm-build-all.sh -si -sb -t "core*" || exit 1;);
(./scripts/npm-build-all.sh -si -sb -t "core" || exit 1;);
fi
- if ([ "$MODULE" == "process-services" ]); then

View File

@@ -69,25 +69,11 @@ module.exports = function (config) {
autoWatch: false,
captureTimeout: 4800000,
browserDisconnectTimeout: 4800000,
browserDisconnectTolerance: 10,
browserNoActivityTimeout: 3000000,
browserDisconnectTimeout: 200000,
browserNoActivityTimeout: 2400000,
captureTimeout: 1200000,
browsers: ['Chrome'],
customLaunchers: {
ChromeHeadless: {
base: 'Chrome',
flags: [
'--no-sandbox',
'--headless',
'--disable-gpu',
'--remote-debugging-port=9222'
]
}
},
// Karma plugins loaded
plugins: [
require('../node_modules/karma-jasmine'),
@@ -126,10 +112,5 @@ module.exports = function (config) {
}
};
if (process.env.TRAVIS) {
config.browsers = ['ChromeHeadless'];
config.reporters = ['dots', 'coverage'];
}
config.set(_config);
};

View File

@@ -133,35 +133,35 @@ export class ContentService {
/**
* Get thumbnail URL for the given document node.
*
* @param {string|MinimalNodeEntity} nodeId Node to get URL for.
* @param {string|MinimalNodeEntity} nodeId or node to get URL for.
* @param {boolean} [attachment] Retrieve content as an attachment for download
* @param {string} [ticket] Custom ticket to use for authentication
* @returns {string} The URL address pointing to the content.
*/
getDocumentThumbnailUrl(nodeId: any, attachment?: boolean, ticket?: string): string {
getDocumentThumbnailUrl(node: any, attachment?: boolean, ticket?: string): string {
if (nodeId && nodeId.entry) {
nodeId = nodeId.entry.id;
if (node && node.entry) {
node = node.entry.id;
}
return this.contentApi.getDocumentThumbnailUrl(nodeId, attachment, ticket);
return this.contentApi.getDocumentThumbnailUrl(node, attachment, ticket);
}
/**
* Get content URL for the given node.
*
* @param nodeId {string|MinimalNodeEntity} Node to get URL for.
* @param node {string|MinimalNodeEntity} nodeId or node to get URL for.
* @param {boolean} [attachment] Retrieve content as an attachment for download
* @param {string} [ticket] Custom ticket to use for authentication
* @returns {string} The URL address pointing to the content.
*/
getContentUrl(nodeId: any, attachment?: boolean, ticket?: string): string {
getContentUrl(node: any, attachment?: boolean, ticket?: string): string {
if (nodeId && nodeId.entry) {
nodeId = nodeId.entry.id;
if (node && node.entry) {
node = node.entry.id;
}
return this.contentApi.getContentUrl(nodeId, attachment, ticket);
return this.contentApi.getContentUrl(node, attachment, ticket);
}
/**

View File

@@ -125,8 +125,8 @@ export class ThumbnailService {
* @param document Node to get URL for.
* @returns {string} URL address.
*/
public getDocumentThumbnailUrl(document: any): string {
let thumbnail = this.contentService.getDocumentThumbnailUrl(document);
public getDocumentThumbnailUrl(node: any): string {
let thumbnail = this.contentService.getDocumentThumbnailUrl(node);
return thumbnail || this.DEFAULT_ICON;
}

View File

@@ -115,7 +115,7 @@
"karma-remap-istanbul": "0.6.0",
"karma-sourcemap-loader": "0.3.7",
"karma-systemjs": "0.16.0",
"karma-webpack": "2.0.5",
"karma-webpack": "2.0.9",
"loader-utils": "1.1.0",
"markdown-toc": "1.1.0",
"markdownlint-cli": "^0.3.1",
@@ -128,7 +128,7 @@
"run-sequence": "1.2.2",
"sass-loader": "6.0.5",
"script-loader": "0.7.0",
"scss-bundle": "^2.1.0",
"scss-bundle": "2.1.0",
"source-map-loader": "0.1.6",
"style-loader": "0.13.1",
"systemjs-builder": "0.15.34",