Skip to content

Commit 25883dd

Browse files
committed
Merge branch 'develop'
* develop: 0.0.5 current build return layout string, as documented removed $mdTheming (will return if implemented in material 1.1.0)
2 parents 5eb6a2b + 364fa3b commit 25883dd

File tree

6 files changed

+12
-25
lines changed

6 files changed

+12
-25
lines changed

dist/mdKeyboard.js

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@
5757
*/
5858

5959
MdKeyboardProvider.$inject = ["$$interimElementProvider", "$injector", "keyboardLayouts", "keyboardDeadkey", "keyboardSymbols", "keyboardNumpad"];
60-
MdKeyboardDirective.$inject = ["$mdKeyboard", "$mdTheming"];
61-
useKeyboardDirective.$inject = ["$mdKeyboard", "$injector", "$timeout", "$animate", "$rootScope"];
60+
MdKeyboardDirective.$inject = ["$mdKeyboard"];
61+
useKeyboardDirective.$inject = ["$mdKeyboard", "$timeout", "$animate", "$rootScope"];
6262
angular
6363
.module('material.components.keyboard', [
6464
'material.core',
@@ -1209,7 +1209,7 @@ function MdKeyboardProvider($$interimElementProvider, $injector, keyboardLayouts
12091209

12101210
// get currently used layout object
12111211
function getCurrentLayout() {
1212-
return LAYOUTS[CURRENT_LAYOUT];
1212+
return CURRENT_LAYOUT;
12131213
}
12141214

12151215
// get currently used layout object
@@ -1419,11 +1419,10 @@ angular
14191419
.directive('mdKeyboard', MdKeyboardDirective)
14201420
.directive('useKeyboard', useKeyboardDirective);
14211421

1422-
function MdKeyboardDirective($mdKeyboard, $mdTheming) {
1422+
function MdKeyboardDirective($mdKeyboard) {
14231423
return {
14241424
restrict: 'E',
1425-
link: function postLink(scope, element, attr) {
1426-
$mdTheming(element);
1425+
link: function postLink(scope) {
14271426
// When navigation force destroys an interimElement, then
14281427
// listen and $destroy() that interim instance...
14291428
scope.$on('$destroy', function () {
@@ -1433,7 +1432,7 @@ function MdKeyboardDirective($mdKeyboard, $mdTheming) {
14331432
};
14341433
}
14351434

1436-
function useKeyboardDirective($mdKeyboard, $injector, $timeout, $animate, $rootScope) {
1435+
function useKeyboardDirective($mdKeyboard, $timeout, $animate, $rootScope) {
14371436
return {
14381437
restrict: 'A',
14391438
require: '?ngModel',
@@ -1603,17 +1602,6 @@ function useKeyboardDirective($mdKeyboard, $injector, $timeout, $animate, $rootS
16031602
break;
16041603

16051604
default:
1606-
1607-
//$timeout(function () {
1608-
//var event = new window.KeyboardEvent('keypress', {
1609-
// bubbles: true,
1610-
// cancelable: true,
1611-
// shiftKey: true,
1612-
// keyCode: key.charCodeAt(0)
1613-
//});
1614-
// element[0].dispatchEvent(event);
1615-
//});
1616-
16171605
$mdKeyboard.currentModel.$setViewValue(($mdKeyboard.currentModel.$viewValue || '') + key[0]);
16181606
$mdKeyboard.currentModel.$validate();
16191607
$mdKeyboard.currentModel.$render();

dist/mdKeyboard.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/mdKeyboard.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,5 +58,5 @@
5858
"test": "echo \"Error: no test specified\" && exit 1",
5959
"build": "gulp build"
6060
},
61-
"version": "0.0.4"
61+
"version": "0.0.5"
6262
}

src/js/mdKeyboard.directive.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@ angular
33
.directive('mdKeyboard', MdKeyboardDirective)
44
.directive('useKeyboard', useKeyboardDirective);
55

6-
function MdKeyboardDirective($mdKeyboard, $mdTheming) {
6+
function MdKeyboardDirective($mdKeyboard) {
77
return {
88
restrict: 'E',
9-
link: function postLink(scope, element) {
10-
$mdTheming(element);
9+
link: function postLink(scope) {
1110
// When navigation force destroys an interimElement, then
1211
// listen and $destroy() that interim instance...
1312
scope.$on('$destroy', function () {

src/js/mdKeyboard.provider.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ function MdKeyboardProvider($$interimElementProvider, $injector, keyboardLayouts
4040

4141
// get currently used layout object
4242
function getCurrentLayout() {
43-
return LAYOUTS[CURRENT_LAYOUT];
43+
return CURRENT_LAYOUT;
4444
}
4545

4646
// get currently used layout object

0 commit comments

Comments
 (0)