@@ -157,8 +157,7 @@ angular.module('material.components.select', [
157
157
* </div>
158
158
* </hljs>
159
159
*/
160
- function SelectDirective ( $mdSelect , $mdUtil , $mdConstant , $mdTheming , $mdAria , $parse , $sce ,
161
- $injector ) {
160
+ function SelectDirective ( $mdSelect , $mdUtil , $mdConstant , $mdTheming , $mdAria , $parse , $sce ) {
162
161
return {
163
162
restrict : 'E' ,
164
163
require : [ '^?mdInputContainer' , 'mdSelect' , 'ngModel' , '?^form' ] ,
@@ -167,6 +166,11 @@ function SelectDirective($mdSelect, $mdUtil, $mdConstant, $mdTheming, $mdAria, $
167
166
} // empty placeholder controller to be initialized in link
168
167
} ;
169
168
169
+ /**
170
+ * @param {JQLite } tElement
171
+ * @param {IAttributes } tAttrs
172
+ * @return {postLink }
173
+ */
170
174
function compile ( tElement , tAttrs ) {
171
175
var isMultiple = $mdUtil . parseAttributeBoolean ( tAttrs . multiple ) ;
172
176
// add the select value that will hold our placeholder or selected option value
@@ -271,7 +275,7 @@ function SelectDirective($mdSelect, $mdUtil, $mdConstant, $mdTheming, $mdAria, $
271
275
var selectValueElement = element . find ( 'md-select-value' ) ;
272
276
var isReadonly = angular . isDefined ( attrs . readonly ) ;
273
277
var disableAsterisk = $mdUtil . parseAttributeBoolean ( attrs . mdNoAsterisk ) ;
274
- var stopNgMultipleWatch ;
278
+ var stopMdMultipleWatch ;
275
279
var userDefinedLabelledby = angular . isDefined ( attrs . ariaLabelledby ) ;
276
280
var listboxContentElement = element . find ( 'md-content' ) ;
277
281
@@ -390,7 +394,7 @@ function SelectDirective($mdSelect, $mdUtil, $mdConstant, $mdTheming, $mdAria, $
390
394
} else {
391
395
selectValueElement . removeAttr ( 'aria-hidden' ) ;
392
396
if ( ! userDefinedLabelledby ) {
393
- element . attr ( 'aria-labelledby' , element [ 0 ] . id + ' ' + selectValueElement [ 0 ] . id )
397
+ element . attr ( 'aria-labelledby' , element [ 0 ] . id + ' ' + selectValueElement [ 0 ] . id ) ;
394
398
}
395
399
}
396
400
} ;
@@ -428,7 +432,7 @@ function SelectDirective($mdSelect, $mdUtil, $mdConstant, $mdTheming, $mdAria, $
428
432
containerCtrl && containerCtrl . setFocused ( false ) ;
429
433
inputCheckValue ( ) ;
430
434
} ;
431
- var handleFocus = function ( ev ) {
435
+ var handleFocus = function ( ) {
432
436
// Always focus the container (if we have one) so floating labels and other styles are
433
437
// applied properly
434
438
containerCtrl && containerCtrl . setFocused ( true ) ;
@@ -465,15 +469,14 @@ function SelectDirective($mdSelect, $mdUtil, $mdConstant, $mdTheming, $mdAria, $
465
469
mdSelectCtrl . setSelectValueText ( selectMenuCtrl . getSelectedLabels ( ) ) ;
466
470
}
467
471
468
- // TODO add tests for ngMultiple
469
- // TODO add docs for ngMultiple
470
- // TODO in 1.2.0 rename this to mdMultiple
471
- var stopNgMultipleObserver = attrs . $observe ( 'ngMultiple' , function ( val ) {
472
- if ( stopNgMultipleWatch ) {
473
- stopNgMultipleWatch ( ) ;
472
+ // TODO add tests for mdMultiple
473
+ // TODO add docs for mdMultiple
474
+ var stopMdMultipleObserver = attrs . $observe ( 'mdMultiple' , function ( val ) {
475
+ if ( stopMdMultipleWatch ) {
476
+ stopMdMultipleWatch ( ) ;
474
477
}
475
478
var parser = $parse ( val ) ;
476
- stopNgMultipleWatch = scope . $watch ( function ( ) {
479
+ stopMdMultipleWatch = scope . $watch ( function ( ) {
477
480
return parser ( scope ) ;
478
481
} , function ( multiple , prevVal ) {
479
482
var selectMenu = selectContainer . find ( 'md-select-menu' ) ;
@@ -561,8 +564,8 @@ function SelectDirective($mdSelect, $mdUtil, $mdConstant, $mdTheming, $mdAria, $
561
564
scope . $on ( '$destroy' , function ( ) {
562
565
stopRequiredObserver && stopRequiredObserver ( ) ;
563
566
stopDisabledObserver && stopDisabledObserver ( ) ;
564
- stopNgMultipleWatch && stopNgMultipleWatch ( ) ;
565
- stopNgMultipleObserver && stopNgMultipleObserver ( ) ;
567
+ stopMdMultipleWatch && stopMdMultipleWatch ( ) ;
568
+ stopMdMultipleObserver && stopMdMultipleObserver ( ) ;
566
569
stopSelectedLabelsWatcher && stopSelectedLabelsWatcher ( ) ;
567
570
stopPlaceholderObserver && stopPlaceholderObserver ( ) ;
568
571
stopInvalidWatch && stopInvalidWatch ( ) ;
@@ -1207,6 +1210,11 @@ function OptionDirective($mdButtonInkRipple, $mdUtil, $mdTheming) {
1207
1210
compile : compile
1208
1211
} ;
1209
1212
1213
+ /**
1214
+ * @param {JQLite } element
1215
+ * @param {IAttributes } attrs
1216
+ * @return {postLink }
1217
+ */
1210
1218
function compile ( element , attrs ) {
1211
1219
// Manual transclusion to avoid the extra inner <span> that ng-transclude generates
1212
1220
element . append ( angular . element ( '<div class="md-text">' ) . append ( element . contents ( ) ) ) ;
@@ -1332,6 +1340,10 @@ function OptionDirective($mdButtonInkRipple, $mdUtil, $mdTheming) {
1332
1340
}
1333
1341
}
1334
1342
1343
+ /**
1344
+ * @param {JQLite } $element
1345
+ * @constructor
1346
+ */
1335
1347
function OptionController ( $element ) {
1336
1348
/**
1337
1349
* @param {boolean } isSelected
@@ -1757,7 +1769,6 @@ function SelectProvider($$interimElementProvider) {
1757
1769
1758
1770
var dropDown = opts . selectEl ;
1759
1771
var selectMenuController = dropDown . controller ( 'mdSelectMenu' ) || { } ;
1760
- var listbox = opts . contentEl ;
1761
1772
1762
1773
element . addClass ( 'md-clickable' ) ;
1763
1774
0 commit comments