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

fix: errors in plunkr template #54

Merged
merged 6 commits into from
Dec 22, 2016
Merged

Conversation

crisbeto
Copy link
Member

  • Fixes errors in the Plunkr template due to outdated Material version.
  • Updates the outdated theme link.
  • Disables the opening of the Plunk in a new tab, because it gets blocked by the browser as a popup.

This is based on the Plunkr from our issue template.

* Fixes errors in the Plunkr template due to outdated Material version.
* Updates the outdated theme link.
* Disables the opening of the Plunk in a new tab, because it gets blocked by the browser as a popup.

This is based on the Plunkr from our issue template.
@crisbeto
Copy link
Member Author

crisbeto commented Dec 22, 2016

@jelbourn a couple of notes:

1. This template will load the latest build of Material, however the Angular version are locked into the ones from NPM. Is this what we want? Otherwise I can switch back to loading from NPM.
2. I disabled the opening in a new tab since the browser considers it a popup and blocks it. I have a workaround which is hacky and will likely break, because of those async requests to read the files. If we made it all synchronous, it can be used. I'm looking for a better workaround.

@@ -23,10 +23,9 @@
</script>

<!-- Load the Angular Material 2 stylesheet -->
<link href="https://unpkg.com/@angular/material/core/theming/prebuilt/indigo-pink.css" rel="stylesheet">

<link href="https://cdn.rawgit.com/angular/material2-builds/master/core/theming/prebuilt/indigo-pink.css" rel="stylesheet">
Copy link
Member

Choose a reason for hiding this comment

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

Using the CDN for rawgit when loading the master branch may cause issues.

See rgrove/rawgit#51

'@angular/router': 'http://unpkg.com/@angular/router/bundles/router.umd.js',
'@angular/platform-browser': 'http://unpkg.com/@angular/platform-browser/bundles/platform-browser.umd.js',
'@angular/platform-browser-dynamic': 'http://unpkg.com/@angular/platform-browser-dynamic/bundles/platform-browser-dynamic.umd.js',
'@angular/material': 'https://cdn.rawgit.com/angular/material2-builds/master/bundles/material.umd.js',
Copy link
Member

Choose a reason for hiding this comment

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

Same here with the cdn. (rgrove/rawgit#51)

@@ -27,7 +27,7 @@ System.config({
'@angular/router': 'http://unpkg.com/@angular/router/bundles/router.umd.js',
'@angular/platform-browser': 'http://unpkg.com/@angular/platform-browser/bundles/platform-browser.umd.js',
'@angular/platform-browser-dynamic': 'http://unpkg.com/@angular/platform-browser-dynamic/bundles/platform-browser-dynamic.umd.js',
'@angular/material': 'https://cdn.rawgit.com/angular/material2-builds/master/bundles/material.umd.js',
'@angular/material': 'https://unpkg.com/@angular/material/core/theming/prebuilt/indigo-pink.css',
Copy link
Member

Choose a reason for hiding this comment

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

This should be actually the .umd bundle 😄

@jelbourn
Copy link
Member

LGTM

@jelbourn jelbourn merged commit 2bd1f5c into angular:master Dec 22, 2016
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants