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

fix(docs, dialog, interim, panel): compatibility with latest angular snapshot #9787

Merged
merged 1 commit into from
Oct 12, 2016

Conversation

crisbeto
Copy link
Member

@crisbeto crisbeto commented Oct 8, 2016

  • Fixes the docs site not working against the latest snapshot.
  • Fixes the dialog throwing an error about ngSanitize not being present and then compiling the contents anyway.
  • Makes the interimElement compatible both with the latest changes to promises from Angular PR #15213 and the current promise handling in Angular <= 1.5.
  • Reintroduces the panel changes from chore(panel): fix failing tests in snapshot #9688 which were overwritten accidentally.
  • Fixes an error that was being swallowed during unit tests, but was still showing up in the $exceptionHandler.

…snapshot

* Fixes the docs site not working against the latest snapshot.
* Fixes the `dialog` throwing an error about `ngSanitize` not being present and then compiling the contents anyway.
* Makes the `interimElement` compatible both with the latest changes to promises from Angular PR #15213 and the current promise handling in Angular <= 1.5.
* Reintroduces the panel changes from angular#9688 which were overwritten accidentally.
* Fixes an error that was being swallowed during unit tests, but was still showing up in the `$exceptionHandler`.
@crisbeto crisbeto added the needs: review This PR is waiting on review from the team label Oct 8, 2016
@devversion
Copy link
Member

LGTM for the $$interimElement and dialog stuff.

// the rejection and only log it if it's an error.
interimElement.deferred.promise.catch(function(fault) {
if (fault instanceof Error) {
$exceptionHandler(fault);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

try {
notifyShowing(options.scope, element, options, controller);
} catch (e) {
return $q.reject(e);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@ThomasBurleson ThomasBurleson added needs: presubmit and removed needs: review This PR is waiting on review from the team labels Oct 9, 2016
@ThomasBurleson ThomasBurleson added this to the 1.1.2 milestone Oct 9, 2016
@ThomasBurleson ThomasBurleson added the P0: critical Critical issues that must be addressed immediately. label Oct 9, 2016
@kara kara added pr: merge ready This PR is ready for a caretaker to review and removed needs: presubmit labels Oct 11, 2016
@kara kara merged commit 4fb1767 into angular:master Oct 12, 2016
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
P0: critical Critical issues that must be addressed immediately. pr: merge ready This PR is ready for a caretaker to review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants