feat(toast): simple with content string: '$mdToast.simple('my-content')`

Closes #833.
angular · Dec 3, 2014 · 554beff · 554beff
1 parent c0bbad2
commit 554beff
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 11 deletions.
diff --git a/src/components/bottomSheet/bottomSheet.js b/src/components/bottomSheet/bottomSheet.js
@@ -116,8 +116,7 @@ function MdBottomSheetProvider($$interimElementProvider) {
     });
 
   /* @ngInject */
-  function bottomSheetDefaults($animate, $mdConstant, $timeout, $$rAF, $compile, $mdTheming,
-                               $mdBottomSheet, $rootElement) {
+  function bottomSheetDefaults($animate, $mdConstant, $timeout, $$rAF, $compile, $mdTheming, $mdBottomSheet, $rootElement) {
     var backdrop;
 
     return {
@@ -148,12 +147,12 @@ function MdBottomSheetProvider($$interimElementProvider) {
 
       return $animate.enter(bottomSheet.element, options.parent)
         .then(function() {
-          var focusableItems = angular.element(
+          var focusable = angular.element(
             element[0].querySelector('button') ||
             element[0].querySelector('a') ||
             element[0].querySelector('[ng-click]')
           );
-          focusableItems.eq(0).focus();
+          focusable.focus();
 
           if (options.escapeToClose) {
             options.rootElementKeyupCallback = function(e) {

diff --git a/src/components/dialog/dialog.js b/src/components/dialog/dialog.js
@@ -258,11 +258,11 @@ function MdDialogProvider($$interimElementProvider) {
       options: dialogDefaultOptions
     })
     .addPreset('alert', {
-      methods: alertDialogMethods,
+      methods: ['title', 'content', 'ariaLabel', 'ok'],
       options: advancedDialogOptions
     })
     .addPreset('confirm', {
-      methods: alertDialogMethods.concat('cancel'),
+      methods: ['title', 'content', 'ariaLabel', 'ok', 'cancel'],
       options: advancedDialogOptions
     });
 

diff --git a/src/components/toast/toast.js b/src/components/toast/toast.js
@@ -145,6 +145,7 @@ function MdToastProvider($$interimElementProvider) {
       options: toastDefaultOptions
     })
     .addPreset('simple', {
+      argOption: 'content',
       methods: ['content', 'action', 'highlightAction'],
       options: /* @ngInject */ function($mdToast) {
         return {

diff --git a/src/core/services/interimElement/interimElement.js b/src/core/services/interimElement/interimElement.js
@@ -38,6 +38,7 @@ function InterimElementProvider() {
    * as well as configuration of 'preset' methods (eg dialog.basic(): basic is a preset method)
    */
   function createInterimElementProvider(interimFactoryName) {
+    var EXPOSED_METHODS = ['onHide', 'onShow'];
     var providerConfig = {
       presets: {}
     };
@@ -51,7 +52,7 @@ function InterimElementProvider() {
      * all interim elements will come with the 'build' preset
      */
     provider.addPreset('build', {
-      methods: ['controller', 'controllerAs', 'onRemove', 'onShow', 'resolve',
+      methods: ['controller', 'controllerAs', 'resolve',
         'template', 'templateUrl', 'themable', 'transformTemplate', 'parent']
     });
 
@@ -65,6 +66,7 @@ function InterimElementProvider() {
       providerConfig.methods = definition.methods;
       return provider;
     }
+
     /**
      * Save the configured preset to be used when the factory is instantiated
      */
@@ -80,8 +82,9 @@ function InterimElementProvider() {
         throw new Error("Method '_options' in " + interimFactoryName + " is reserved!");
       }
       providerConfig.presets[name] = {
-        methods: definition.methods,
-        optionsFactory: definition.options
+        methods: definition.methods.concat(EXPOSED_METHODS),
+        optionsFactory: definition.options,
+        argOption: definition.argOption
       };
       return provider;
     }
@@ -145,8 +148,19 @@ function InterimElementProvider() {
         });
 
         // eg $mdDialog.alert() will return a new alert preset
-        publicService[name] = function(options) {
-          return new Preset(options);
+        publicService[name] = function(arg) {
+          // If argOption is supplied, eg `argOption: 'content'`, then we assume
+          // if the argument is not an options object then it is the `argOption` option.
+          //
+          // @example `$mdToast.simple('hello')` // sets options.content to hello
+          //                                     // because argOption === 'content'
+          if (arguments.length && definition.argOption && !angular.isObject(arg) &&
+              !angular.isArray(arg)) {
+            return (new Preset())[definition.argOption](arg);
+          } else {
+            return new Preset(arg);
+          }
+
         };
       });
 

diff --git a/src/core/services/interimElement/interimElement.spec.js b/src/core/services/interimElement/interimElement.spec.js
@@ -139,6 +139,24 @@ describe('$$interimElement service', function() {
       });
     });
 
+    it('should allow argOption in a custom builder', function() {
+      createInterimProvider('interimTest')
+        .addPreset('banana', {
+          argOption: 'color',
+          methods: ['color']
+        });
+      inject(function(interimTest, $rootScope) {
+        var shown = false;
+        var builder = interimTest.banana('yellow').onShow(function(scope, element, options) {
+          expect(options.color).toBe('yellow');
+          shown = true;
+        });
+        interimTest.show(builder);
+        $rootScope.$apply();
+        expect(shown).toBe(true);
+      });
+    });
+
     it('should show with proper options', function() {
       createInterimProvider('interimTest')
         .setDefaults({