Skip to content
This repository has been archived by the owner on Jul 30, 2018. It is now read-only.

Updates for TypeScript 2.5 #651

Merged
merged 3 commits into from
Oct 13, 2017
Merged

Updates for TypeScript 2.5 #651

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9f265b6
Updates for TypeScript 2.5
kitsonk Aug 29, 2017
19079f4
Update to TS 2.5.2
kitsonk Aug 31, 2017
12e87f8
Fix package.json
kitsonk Aug 31, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,13 @@
"jsdom": "^9.5.0",
"sinon": "^1.17.6",
"tslint": "^5.2.0",
"typescript": "~2.4.1"
"typescript": "~2.5.2"
},
"dependencies": {
"@dojo/core": "next",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you mean to add these as deps?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

DOH! no... it was the freaking lack of --no-save and then me thinking it was just overwriting what was already there...

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The next release of grunt-dojo2 should fix that 😄

"@dojo/has": "next",
"@dojo/i18n": "next",
"@dojo/shim": "next",
"maquette": "~2.5.1",
"pepjs": "^0.4.2"
}
Expand Down
10 changes: 5 additions & 5 deletions src/mixins/Themeable.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ export function ThemeableMixin<E, T extends Constructor<WidgetBase<ThemeableProp

const themeable = this;
function classesGetter(this: ClassesFunctionChain) {
const themeClasses = themeable._getThemeClasses(this.classes);
const themeClasses = themeable._getThemeClasses(this.classes as (keyof E)[]);
const fixedClasses = themeable._getFixedClasses(this.fixedClasses);
return assign({}, themeable._allClasses, themeClasses, fixedClasses);
}
Expand Down Expand Up @@ -266,7 +266,7 @@ export function ThemeableMixin<E, T extends Constructor<WidgetBase<ThemeableProp
/**
* Get theme class object from classNames
*/
private _getThemeClasses(classNames: string[]): ClassNameFlags {
private _getThemeClasses(classNames: (keyof E)[]): ClassNameFlags {
return classNames
.filter((className) => !!className)
.reduce((appliedClasses: {}, className: string) => {
Expand All @@ -276,7 +276,7 @@ export function ThemeableMixin<E, T extends Constructor<WidgetBase<ThemeableProp
}
className = this._baseThemeClassesReverseLookup[className];
if (!this._registeredClassesMap.has(className)) {
this._registerThemeClass(className);
this._registerThemeClass(className as keyof E);
}
return assign(appliedClasses, this._registeredClassesMap.get(className));
}, {});
Expand Down Expand Up @@ -306,7 +306,7 @@ export function ThemeableMixin<E, T extends Constructor<WidgetBase<ThemeableProp
*
* @param className the name of the class to register.
*/
private _registerThemeClass(className: string) {
private _registerThemeClass(className: keyof E) {
const { properties: { extraClasses = {} } } = this;
const themeClass = this._theme[className] ? this._theme[className] : this._getBaseThemeClass(className);
const extraClassesClassNames = extraClasses[className];
Expand Down Expand Up @@ -338,7 +338,7 @@ export function ThemeableMixin<E, T extends Constructor<WidgetBase<ThemeableProp
return assign(baseTheme, theme[themeKey]);
}, {});

this._registeredClassesMap.forEach((value, key) => {
this._registeredClassesMap.forEach((value, key: keyof E) => {
this._registerThemeClass(key);
});
this._recalculateClasses = false;
Expand Down