Skip to content
This repository was archived by the owner on Sep 5, 2024. It is now read-only.

Commit eae9eea

Browse files
EladBezalelThomasBurleson
authored andcommitted
fix(interimElement): Removed unnecessary resolve fallback values
Removed SHOW_CLOSED fallback that caused false, empty string or undefined in the resolved promise to become true fixes #4094. fixes #4150. closes #4982.
1 parent d2140b1 commit eae9eea

File tree

4 files changed

+34
-9
lines changed

4 files changed

+34
-9
lines changed

src/components/dialog/dialog.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ describe('$mdDialog', function() {
354354

355355
container = angular.element(parent[0].querySelector('.md-dialog-container'));
356356
expect(container.length).toBe(0);
357-
expect(response).toBe(false);
357+
expect(response).toBe(undefined);
358358
}));
359359
});
360360

src/components/toast/toast.spec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ describe('$mdToast service', function() {
229229

230230
$material.flushInterimElement();
231231

232-
expect(result).toBe(true);
232+
expect(result).toBe(undefined);
233233
expect(angular.isUndefined(fault)).toBe(true);
234234

235235
}));
@@ -269,7 +269,7 @@ describe('$mdToast service', function() {
269269

270270
$material.flushInterimElement();
271271

272-
expect(result).toBe(true);
272+
expect(result).toBe(undefined);
273273
expect(angular.isUndefined(fault)).toBe(true);
274274

275275
}));

src/core/services/interimElement/interimElement.js

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,6 @@ function InterimElementProvider() {
244244
$mdUtil, $mdCompiler, $mdTheming, $log ) {
245245
return function createInterimElementService() {
246246
var SHOW_CANCELLED = false;
247-
var SHOW_CLOSED = true;
248247

249248
/*
250249
* @ngdoc service
@@ -318,7 +317,7 @@ function InterimElementProvider() {
318317
*
319318
*/
320319
function hide(reason, options) {
321-
if ( !stack.length ) return $q.when(reason || SHOW_CLOSED);
320+
if ( !stack.length ) return $q.when(reason);
322321
options = options || {};
323322

324323
if (options.closeAll) {
@@ -334,7 +333,7 @@ function InterimElementProvider() {
334333

335334
function closeElement(interim) {
336335
interim
337-
.remove(reason || SHOW_CLOSED, false, options || { })
336+
.remove(reason, false, options || { })
338337
.catch(function( reason ) {
339338
//$log.error("InterimElement.hide() error: " + reason );
340339
return reason;
@@ -357,10 +356,10 @@ function InterimElementProvider() {
357356
*/
358357
function cancel(reason, options) {
359358
var interim = stack.shift();
360-
if ( !interim ) return $q.when(reason || SHOW_CANCELLED);
359+
if ( !interim ) return $q.when(reason);
361360

362361
interim
363-
.remove(reason || SHOW_CANCELLED, true, options || { })
362+
.remove(reason, true, options || { })
364363
.catch(function( reason ) {
365364
//$log.error("InterimElement.cancel() error: " + reason );
366365
return reason;

src/core/services/interimElement/interimElement.spec.js

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,7 @@ describe('$$interimElement service', function() {
534534
}
535535
}));
536536

537-
it('resolves the show promise', inject(function( ) {
537+
it('resolves the show promise with string', inject(function( ) {
538538
var resolved = false;
539539

540540
Service.show().then(function(arg) {
@@ -547,6 +547,32 @@ describe('$$interimElement service', function() {
547547
expect(resolved).toBe(true);
548548
}));
549549

550+
it('resolves the show promise with false', inject(function( ) {
551+
var resolved = false;
552+
553+
Service.show().then(function(arg) {
554+
expect(arg).toBe(false);
555+
resolved = true;
556+
});
557+
558+
Service.hide(false);
559+
560+
expect(resolved).toBe(true);
561+
}));
562+
563+
it('resolves the show promise with undefined', inject(function( ) {
564+
var resolved = false;
565+
566+
Service.show().then(function(arg) {
567+
expect(arg).toBe(undefined);
568+
resolved = true;
569+
});
570+
571+
Service.hide();
572+
573+
expect(resolved).toBe(true);
574+
}));
575+
550576
describe('captures and fails with ',function(){
551577

552578
it('internal exception during hide()', inject(function($q, $timeout) {

0 commit comments

Comments
 (0)