Skip to content

Commit

Permalink
Merge branch 'master' into miwhea/update-cdn-references
Browse files Browse the repository at this point in the history
  • Loading branch information
Mike Wheaton authored Nov 23, 2016
2 parents 6e48f21 + 16803ac commit da171a9
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,7 @@ If you have any style issues - icons, typography, fonts, colors, the grid, etc.

## Licenses

All files on the Office UI Fabric GitHub repository are subject to the MIT license. Please read the License file at the root of the project. Usage of the fonts referenced on Office UI Fabric files is subject to the [license](http://aka.ms/fabric-font-license).

All files in this GitHub repository are subject to the [MIT license](https://github.com/OfficeDev/office-ui-fabric-core/blob/master/LICENSE). This project also references fonts and icons from a CDN, which are subject to a separate [asset license](https://static2.sharepointonline.com/files/fabric/assets/license.txt).

## Changelog
We use [GitHub Releases](https://github.com/blog/1547-release-your-software) to manage our releases, including the changelog between every release. View a complete list of additions, fixes, and changes since 1.0 on the [releases](https://github.com/OfficeDev/office-ui-fabric-js/releases) page.
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,6 @@
"walk-sync": "^0.2.6"
},
"dependencies": {
"office-ui-fabric-core": "4.0.0"
"office-ui-fabric-core": "5.0.1"
}
}
2 changes: 1 addition & 1 deletion src/components/CheckBox/CheckBox.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ namespace fabric {
this._choiceField.removeEventListener("focus", this._FocusHandler.bind(this));
this._choiceField.removeEventListener("blur", this._BlurHandler.bind(this));
this._choiceField.removeEventListener("click", this._ClickHandler.bind(this));
this._choiceField.addEventListener("keydown", this._KeydownHandler.bind(this));
this._choiceField.removeEventListener("keydown", this._KeydownHandler.bind(this));
}

protected _addListeners(events?): void {
Expand Down

0 comments on commit da171a9

Please sign in to comment.