Skip to content
This repository has been archived by the owner on Dec 8, 2022. It is now read-only.

Commit

Permalink
Updated version of Stache (#805)
Browse files Browse the repository at this point in the history
* Updated version of stache

* Add tsconfig ignore for visual tests

* Hit release candidate branch

* Fix build errors

* Update baseline screenshots in travis scripts

* white space bump
  • Loading branch information
Blackbaud-SteveBrush authored and Blackbaud-PatrickOFriel committed Jun 16, 2017
1 parent a7e37d1 commit d2caa3a
Show file tree
Hide file tree
Showing 9 changed files with 11 additions and 17 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"@angular/platform-browser": "4.1.3",
"@angular/platform-browser-dynamic": "4.1.3",
"@angular/router": "4.1.3",
"@blackbaud/stache": "2.0.0-beta.2",
"@blackbaud/stache": "2.0.0-beta.3",
"core-js": "2.4.1",
"dragula": "3.7.2",
"font-awesome": "4.7.0",
Expand Down
2 changes: 1 addition & 1 deletion scripts/visual-baseline.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ if [[ "$TRAVIS_PULL_REQUEST" == "false" && ! $TRAVIS_BRANCH =~ $SAVAGE_BRANCH ]]
if [ -z "$(git ls-files --others --exclude-standard)" ]; then
echo -e "No changes to commit to skyux2."
else
git add webdriver-screenshots/
git add skyux-spa-visual-tests/screenshots-baseline/
git commit -m "Travis build $TRAVIS_BUILD_NUMBER pushed to skyux2 [ci skip]"
git push -fq origin $TRAVIS_BRANCH > /dev/null
echo -e "skyux2 successfully updated.\n"
Expand Down
2 changes: 1 addition & 1 deletion skyux-spa-visual-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"license": "ISC",
"devDependencies": {
"@blackbaud/skyux-builder": "blackbaud/skyux-builder#update-angular",
"@blackbaud/skyux": "blackbaud/skyux2#ng4-upgrade",
"@blackbaud/skyux": "blackbaud/skyux2#rc-ng4-upgrade",
"codelyzer": "3.0.1",
"moment": "2.18.1",
"dragula": "3.7.2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ export class PageSummaryVisualComponent {

public showKeyInfo = false;

[key: string]: boolean | string;

public get itemsToShow(): string {
return this._itemsToShow;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export class SearchVisualComponent {
public displayedItems: any;
public searchText: string;

private items = [
private items: Array<any> = [
{
title: 'Call Robert Hernandez',
note: 'Robert recently gave a very generous gift. We should call to thank him.'
Expand Down Expand Up @@ -43,7 +43,7 @@ export class SearchVisualComponent {
if (searchText) {
filteredItems = this.items.filter(function (item) {
let property: any;
for (property in item) {
for (property in item as any) {
if (item.hasOwnProperty(property) && (property === 'title' || property === 'note')) {
/* tslint:disable */
if (item[property].indexOf(searchText) > -1) {
Expand Down
3 changes: 1 addition & 2 deletions skyuxconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"cssPath": "src/scss/sky.scss",
"compileMode": "aot",
"plugins": [
"@blackbaud/skyux-builder-plugin-stache-code-block",
"@blackbaud/skyux-builder-plugin-stache-include"
"@blackbaud/skyux-builder-plugin-stache"
]
}
9 changes: 2 additions & 7 deletions src/app/app-extras.module.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import { NgModule } from '@angular/core';

import { StacheModule, StacheConfigService } from'@blackbaud/stache';
import { StacheModule } from'@blackbaud/stache';

import { SkyAppConfig } from '@blackbaud/skyux-builder/runtime';
import { SkyDemoTitleService } from './shared/title.service';
import { SkyFilterDemoModalComponent } from './components/filter/filter-demo-modal.component';
import { SkyListFiltersModalDemoComponent }
Expand Down Expand Up @@ -34,11 +33,7 @@ require('style-loader!./styles.scss');
StacheModule
],
providers: [
SkyDemoTitleService,
{
provide: StacheConfigService,
useExisting: SkyAppConfig
}
SkyDemoTitleService
]
})
export class AppExtrasModule { }
1 change: 0 additions & 1 deletion src/modules/text-expand/text-expand.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -177,5 +177,4 @@ export class SkyTextExpandComponent implements AfterContentInit {
adapter.setContainerHeight(container, `${newHeight}px`);
}, 5);
}

}
3 changes: 1 addition & 2 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@
"exclude": [
"node_modules",
"dist",
"skyux-spa-visual-tests/node_modules",
"skyux-spa-visual-tests/dist"
"skyux-spa-visual-tests"
],
"compileOnSave": false,
"buildOnSave": false,
Expand Down

0 comments on commit d2caa3a

Please sign in to comment.