Browse Source

Build fixes

pull/271/head
Sebastian Stehle 8 years ago
parent
commit
9ef8983b3b
  1. 12
      libs/Dockerfile
  2. 10
      src/Squidex/app-config/karma.coverage.conf.js
  3. 2
      src/Squidex/app/features/content/shared/assets-editor.component.html
  4. 8
      src/Squidex/app/features/content/shared/assets-editor.component.ts
  5. 2
      src/Squidex/app/features/schemas/pages/schema/schema-scripts-form.component.html
  6. 2
      src/Squidex/app/features/settings/pages/plans/plans-page.component.html
  7. 2
      src/Squidex/app/shared/components/markdown-editor.component.html
  8. 4
      src/Squidex/app/shared/components/markdown-editor.component.scss
  9. 2
      src/Squidex/app/shared/components/rich-editor.component.html
  10. 4
      src/Squidex/app/shared/components/rich-editor.component.scss
  11. 2
      src/Squidex/app/shared/state/assets.state.ts
  12. 2
      src/Squidex/app/shared/state/schemas.state.spec.ts

12
libs/Dockerfile

@ -6,7 +6,7 @@ RUN apt-get update \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*
# Install official PhantomJS release
# Install official PhantomJS release
RUN set -x \
&& apt-get update \
&& apt-get install -y --no-install-recommends \
@ -22,4 +22,12 @@ RUN set -x \
&& apt-get clean all \
&& rm -rf /tmp/* /var/lib/apt/lists/*
RUN phantomjs --version
RUN phantomjs --version
# Install Google Chrome
RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -
RUN sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list'
RUN apt-get update
&& apt-get install -y google-chrome-stable

10
src/Squidex/app-config/karma.coverage.conf.js

@ -65,12 +65,20 @@ module.exports = function (config) {
*/
singleRun: true,
customLaunchers: {
ChromeCustom: {
base: 'ChromeHeadless',
// We must disable the Chrome sandbox (Chrome's sandbox needs more permissions than Docker allows by default)
flags: ['--no-sandbox']
}
},
/**
* Run with chrome because phantom js does not provide all types, e.g. DragEvent
*
* available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
*/
browsers: ['ChromeHeadless']
browsers: ['ChromeCustom']
};
config.set(_config);

2
src/Squidex/app/features/content/shared/assets-editor.component.html

@ -1,7 +1,7 @@
<div class="assets-container" [class.disabled]="isDisabled">
<div class="row">
<div class="col-4 drop-area-container">
<div class="drop-area" dnd-droppable (onDropSuccess)="onAssetDropped($event.dragData)" [allowDrop]="canDrop()" (sqxFileDrop)="addFiles($event)" (click)="selectorModal.show()">
<div class="drop-area" (sqxFileDrop)="addFiles($event)" (click)="selectorModal.show()">
Drop files here to add them.
</div>
</div>

8
src/Squidex/app/features/content/shared/assets-editor.component.ts

@ -79,14 +79,6 @@ export class AssetsEditorComponent implements ControlValueAccessor {
}
}
public canDrop() {
const component = this;
return (dragData: any) => {
return !component.isDisabled && dragData instanceof AssetDto && !component.oldAssets.find(a => a.id === dragData.id);
};
}
public onAssetsSelected(assets: AssetDto[]) {
for (let asset of assets) {
this.oldAssets = this.oldAssets.push(asset);

2
src/Squidex/app/features/schemas/pages/schema/schema-scripts-form.component.html

@ -23,7 +23,7 @@
</ng-container>
<ng-container footer>
<button type="reset" class="float-left btn btn-secondary" (click)="complete()" [disabled]="editFormSubmitted">Cancel</button>
<button type="reset" class="float-left btn btn-secondary" (click)="complete()" [disabled]="editForm.submitted | async">Cancel</button>
<button type="submit" class="float-right btn btn-primary">Save</button>
</ng-container>
</sqx-modal-dialog>

2
src/Squidex/app/features/settings/pages/plans/plans-page.component.html

@ -1,4 +1,4 @@
<sqx-title message="{app} | Plans | Settings" parameter1="app" [value1]="ctx.appName"></sqx-title>
<sqx-title message="{app} | Plans | Settings" parameter1="app" [value1]="appsState.appName"></sqx-title>
<sqx-panel desiredWidth="61rem">
<div class="panel-header">

2
src/Squidex/app/shared/components/markdown-editor.component.html

@ -3,7 +3,7 @@
<textarea class="form-control" #editor></textarea>
</div>
<div class="file-drop drag drop-area" [class.dragging]="draggedOver" dnd-droppable (onDropSuccess)="onItemDropped($event)">
<div class="file-drop drag drop-area">
<div class="drop-text">Drop assets here to add them.</div>
</div>
</div>

4
src/Squidex/app/shared/components/markdown-editor.component.scss

@ -7,10 +7,6 @@ $background: #fff;
height: 30rem;
}
.drop-area {
@include absolute(80px, 30px, 66px, 30px);
}
.fullscreen {
@include fixed(0, 0, 0, 0);
border: 0;

2
src/Squidex/app/shared/components/rich-editor.component.html

@ -1,7 +1,7 @@
<div class="drop-container">
<div class="editor" #editor></div>
<div class="file-drop drag drop-area" [class.dragging]="draggedOver" dnd-droppable (onDropSuccess)="onItemDropped($event)">
<div class="file-drop drag drop-area">
<div class="drop-text">Drop assets here to add them.</div>
</div>
</div>

4
src/Squidex/app/shared/components/rich-editor.component.scss

@ -5,8 +5,4 @@
background: $color-dark-foreground;
border: 1px solid $color-input;
height: 30rem;
}
.drop-area {
@include absolute(100px, 30px, 66px, 30px);
}

2
src/Squidex/app/shared/state/assets.state.ts

@ -112,7 +112,7 @@ export class AssetsState extends State<Snapshot> {
}
public search(query: string): Observable<any> {
this.next(s => ({ ...s, assetsPager: new Pager(0), assetsQuery: query }));
this.next(s => ({ ...s, assetsPager: new Pager(0, 0, 30), assetsQuery: query }));
return this.loadAssets();
}

2
src/Squidex/app/shared/state/schemas.state.spec.ts

@ -163,7 +163,7 @@ describe('SchemasState', () => {
expectToBeModified(schema_1);
});
describe('without selection', () => {
describe('with selection', () => {
beforeEach(() => {
schemasState.selectSchema(schema.name).subscribe();
});

Loading…
Cancel
Save