Load HammerJs in index.html (angular#47)

* Load HammerJs * Fix lint error
andrewseguin · Dec 22, 2016 · 74c14d2 · 74c14d2
1 parent 7d19065
commit 74c14d2
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 13 deletions.
diff --git a/angular-cli.json b/angular-cli.json
@@ -18,7 +18,8 @@
       "prefix": "app",
       "mobile": false,
       "styles": [
-        "main.scss"
+        "main.scss",
+        "highlightjs/solarized-light.css"
       ],
       "scripts": [],
       "environments": {

diff --git a/browser-providers.js b/browser-providers.js
@@ -14,7 +14,7 @@ const configuration = {
   'IE9':          { unitTest: {target: null}, e2e: {target: null}},
   'IE10':         { unitTest: {target: null}, e2e: {target: null}},
   'IE11':         { unitTest: {target: null}, e2e: {target: null}},
-  'Edge':         { unitTest: {target: 'SL'}, e2e: {target: null}},
+  'Edge':         { unitTest: {target: null}, e2e: {target: null}},
   'Android4.1':   { unitTest: {target: null}, e2e: {target: null}},
   'Android4.2':   { unitTest: {target: null}, e2e: {target: null}},
   'Android4.3':   { unitTest: {target: null}, e2e: {target: null}},
@@ -297,4 +297,4 @@ function buildConfiguration(type, target) {
     .map(item => [item, configuration[item][type]])
     .filter(([item, conf]) => conf.target == target)
     .map(([item, conf]) => `${target}_${item.toUpperCase()}`);
-}
+}
diff --git a/src/app/examples/dialog-result/dialog-result-example.ts b/src/app/examples/dialog-result/dialog-result-example.ts
@@ -15,7 +15,7 @@ export class DialogResultExample {
     let dialogRef = this.dialog.open(DialogResultExampleDialog);
     dialogRef.afterClosed().subscribe(result => {
       this.selectedOption = result;
-    })
+    });
   }
 }
 

diff --git a/src/index.html b/src/index.html
@@ -4,7 +4,6 @@
   <meta charset="utf-8">
   <title>Angular Material</title>
   <base href="/">
-
   <meta name="viewport" content="width=device-width, initial-scale=1">
 
   <link rel="icon" type="image/x-icon" href="favicon.ico">
@@ -16,24 +15,17 @@
   <link rel="icon" type="image/png" href="assets/img/favicons/android-chrome-192x192.png"
       sizes="192x192">
   <link rel="manifest" href="assets/img/favicons/manifest.json">
-
   <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
-
-  <!-- TODO(jelbourn): load highlight.js style based on the current theme -->
-  <link rel="stylesheet" href="./highlightjs/solarized-light.css">
 </head>
 
 <body>
-
   <material-docs-app>Loading...</material-docs-app>
-  <!-- TODO: google feedback -->
-  <!-- TODO: twitter widget (but only on pages that use twitter) -->
-
   <script>
     window.ga=window.ga||function(){(ga.q=ga.q||[]).push(arguments)};ga.l=+new Date;
     ga('create', 'UA-8594346-24', 'auto');
     ga('send', 'pageview');
   </script>
   <script async src='https://www.google-analytics.com/analytics.js'></script>
+  <script async src="https://ajax.googleapis.com/ajax/libs/hammerjs/2.0.8/hammer.min.js"></script>
 </body>
 </html>
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,7 +15,7 @@ export class DialogResultExample { @@
         let dialogRef = this.dialog.open(DialogResultExampleDialog);
         dialogRef.afterClosed().subscribe(result => {
           this.selectedOption = result;
-        })
+        });
       }
     }
@@ Expand Down @@