Merge branch 'develop'

* develop:
  0.0.6
  fixed layout switching / default layout handling

Author: davidenke

demo.html

@@ -53,7 +53,7 @@ <h1 class="md-headline">Angular Material Keyboard Demo</h1>
                         ], 'lang': ['de']
                     });
 
-                    // default layout is english
+                    // default layout is german
                     $mdKeyboardProvider.defaultLayout('Deutsch');
                 })
                 .controller('keyboardDemoCtrl', function ($scope) {

dist/mdKeyboard.js

@@ -1246,13 +1246,10 @@ function MdKeyboardProvider($$interimElementProvider, keyboardLayouts, keyboardD
 
     // set name of layout to use
     function useLayout(layout) {
-        if (LAYOUTS[layout]) {
+        if (layout && LAYOUTS[layout]) {
             CURRENT_LAYOUT = layout;
-            // broadcast new layout
-            if (SCOPE) {
-                SCOPE.$broadcast('$mdKeyboardLayoutChanged', CURRENT_LAYOUT);
-            }
         } else {
+            CURRENT_LAYOUT = DEFAULT_LAYOUT;
             if (layout.length) {
                 var msg = "" +
                     "The keyboard layout '" + layout + "' does not exists. \n" +
@@ -1261,6 +1258,10 @@ function MdKeyboardProvider($$interimElementProvider, keyboardLayouts, keyboardD
                 console.warn(msg);
             }
         }
+        // broadcast new layout
+        if (SCOPE) {
+            SCOPE.$broadcast('$mdKeyboardLayoutChanged', CURRENT_LAYOUT);
+        }
     }
 
     // add a custom layout
@@ -1300,7 +1301,7 @@ function MdKeyboardProvider($$interimElementProvider, keyboardLayouts, keyboardD
             numpad: NUMPAD
         };
 
-        function onShow(scope, element, options, controller) {
+        function onShow(scope, element, options) {
 
             //if (options.clickOutsideToClose) {
             //    document.body.on('click', function () {
@@ -1612,11 +1613,11 @@ function useKeyboardDirective($mdKeyboard, $timeout, $animate, $rootScope) {
                         $mdKeyboard.hide('ok');
                     };
                     $scope.getKeyClass = getKeyClass;
-                    $scope.keyboard = $mdKeyboard.getCurrentLayout();
+                    $scope.keyboard = $mdKeyboard.getLayout($mdKeyboard.getCurrentLayout());
                     $scope.pressed = triggerKey;
 
-                    $scope.$on('$mdKeyboardLayoutChanged', function () {
-                        $scope.keyboard = $mdKeyboard.getCurrentLayout();
+                    $scope.$on('$mdKeyboardLayoutChanged', function ($event, layout) {
+                        $scope.keyboard = $mdKeyboard.getLayout(layout);
                         $scope.$apply();
                     });
                 };

dist/mdKeyboard.min.css

@@ -58,5 +58,5 @@
     "test": "echo \"Error: no test specified\" && exit 1",
     "build": "gulp build"
   },
-  "version": "0.0.5"
+  "version": "0.0.6"
 }

dist/mdKeyboard.min.js

@@ -201,11 +201,11 @@ function useKeyboardDirective($mdKeyboard, $timeout, $animate, $rootScope) {
                         $mdKeyboard.hide('ok');
                     };
                     $scope.getKeyClass = getKeyClass;
-                    $scope.keyboard = $mdKeyboard.getCurrentLayout();
+                    $scope.keyboard = $mdKeyboard.getLayout($mdKeyboard.getCurrentLayout());
                     $scope.pressed = triggerKey;
 
-                    $scope.$on('$mdKeyboardLayoutChanged', function () {
-                        $scope.keyboard = $mdKeyboard.getCurrentLayout();
+                    $scope.$on('$mdKeyboardLayoutChanged', function ($event, layout) {
+                        $scope.keyboard = $mdKeyboard.getLayout(layout);
                         $scope.$apply();
                     });
                 };

package.json

@@ -77,13 +77,10 @@ function MdKeyboardProvider($$interimElementProvider, keyboardLayouts, keyboardD
 
     // set name of layout to use
     function useLayout(layout) {
-        if (LAYOUTS[layout]) {
+        if (layout && LAYOUTS[layout]) {
             CURRENT_LAYOUT = layout;
-            // broadcast new layout
-            if (SCOPE) {
-                SCOPE.$broadcast('$mdKeyboardLayoutChanged', CURRENT_LAYOUT);
-            }
         } else {
+            CURRENT_LAYOUT = DEFAULT_LAYOUT;
             if (layout.length) {
                 var msg = "" +
                     "The keyboard layout '" + layout + "' does not exists. \n" +
@@ -92,6 +89,10 @@ function MdKeyboardProvider($$interimElementProvider, keyboardLayouts, keyboardD
                 console.warn(msg);
             }
         }
+        // broadcast new layout
+        if (SCOPE) {
+            SCOPE.$broadcast('$mdKeyboardLayoutChanged', CURRENT_LAYOUT);
+        }
     }
 
     // add a custom layout
@@ -131,7 +132,7 @@ function MdKeyboardProvider($$interimElementProvider, keyboardLayouts, keyboardD
             numpad: NUMPAD
         };
 
-        function onShow(scope, element, options, controller) {
+        function onShow(scope, element, options) {
 
             //if (options.clickOutsideToClose) {
             //    document.body.on('click', function () {