Merge all the layouts so they are identical - yipee

Matt Gaunt · Matt Gaunt · commit ea0322584f9b · 2015-11-03T10:44:54.000Z
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@ A sample web app shell demonstrating a shell + content architecture using [Servi
 * Time to first paint is extremely fast
 * Content is rendered. App shell can be a placeholder.
 * User can scroll, but doesn’t necessarily need to be able to navigate or deeply interact.
-* First pageload > 1000ms
+* First pageload < 1000ms
  * App shell is progressively enhanced in.
  * User can now navigate within the app.
 * Second pageload
diff --git a/gulp-tasks/scripts.js b/gulp-tasks/scripts.js
@@ -22,7 +22,6 @@ var eslint = require('gulp-eslint');
 var path = require('path');
 var glob = require('glob');
 var browserify = require('browserify');
-var babelify = require('babelify');
 var gutil = require('gulp-util');
 var source = require('vinyl-source-stream');
 var uglify = require('gulp-uglify');
@@ -45,7 +44,7 @@ function compileES6Bundles(browserifyBundles, cb) {
     var browserifyBundle = browserify({
       entries: [bundle.srcPath]
     })
-    .transform(babelify);
+    .transform('babelify', {presets: ['es2015']});
 
     return browserifyBundle.bundle()
       .on('log', gutil.log.bind(gutil, 'Browserify Log'))
diff --git a/package.json b/package.json
@@ -1,13 +1,14 @@
 {
   "name": "app-shell",
-  "version": "0.1.174",
+  "version": "0.1.175",
   "private": true,
   "license": "Apache",
   "engines": {
     "node": ">=0.10.0"
   },
   "devDependencies": {
-    "babelify": "^6.3.0",
+    "babel-preset-es2015": "^6.0.15",
+    "babelify": "^7.2.0",
     "browserify": "^11.2.0",
     "del": "^2.0.2",
     "express": "^4.13.3",
diff --git a/server/layouts/default.handlebars b/server/layouts/default.handlebars
@@ -20,7 +20,7 @@ limitations under the License.
 <html>
 <head>
     <meta charset="utf-8">
-    <title>Static Page</title>
+    <title>App Shell</title>
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width, initial-scale=1">
diff --git a/src/scripts/controller/ApplicationController.js b/src/scripts/controller/ApplicationController.js
@@ -25,16 +25,16 @@ export default class ApplicationController extends Controller {
   constructor() {
     super();
 
-    this.navDrawer = new NavDrawerView();
+    var navDrawer = new NavDrawerView();
 
-    this.sideNavToggleButton = document.querySelector('.js-toggle-menu');
-    this.sideNavToggleButton.addEventListener('click', () => {
-      this.navDrawer.toggle();
+    var sideNavToggleButton = document.querySelector('.js-toggle-menu');
+    sideNavToggleButton.addEventListener('click', () => {
+      navDrawer.toggle();
     });
 
     // TODO: Find more elegant solution to this and handling anchors in the
     // web app for dynamically loaded content
-    var anchorElements = this.navDrawer.sideNavContent.querySelectorAll('a');
+    var anchorElements = navDrawer.sideNavContent.querySelectorAll('a');
     for (var i = 0; i < anchorElements.length; i++) {
       if (!anchorElements[i].href) {
         continue;
@@ -43,7 +43,7 @@ export default class ApplicationController extends Controller {
       anchorElements[i].addEventListener('click', (clickEvent) => {
         clickEvent.preventDefault();
 
-        this.navDrawer.close();
+        navDrawer.close();
 
         var router = RouterSingleton.getRouter();
         router.goToPath(clickEvent.target.href);
diff --git a/src/scripts/controller/StaticPageController.js b/src/scripts/controller/StaticPageController.js
@@ -23,11 +23,11 @@ export default class StaticPageController extends Controller {
   constructor() {
     super();
 
-    this.navDrawer = new NavDrawerView();
+    var navDrawer = new NavDrawerView();
 
-    this.sideNavToggleButton = document.querySelector('.js-toggle-menu');
-    this.sideNavToggleButton.addEventListener('click', () => {
-      this.navDrawer.toggle();
+    var sideNavToggleButton = document.querySelector('.js-toggle-menu');
+    sideNavToggleButton.addEventListener('click', () => {
+      navDrawer.toggle();
     });
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -23,11 +23,11 @@ export default class StaticPageController extends Controller {`
`23`	`23`	`constructor() {`
`24`	`24`	`super();`
`25`	`25`
`26`		`- this.navDrawer = new NavDrawerView();`
	`26`	`+ var navDrawer = new NavDrawerView();`
`27`	`27`
`28`		`- this.sideNavToggleButton = document.querySelector('.js-toggle-menu');`
`29`		`- this.sideNavToggleButton.addEventListener('click', () => {`
`30`		`- this.navDrawer.toggle();`
	`28`	`+ var sideNavToggleButton = document.querySelector('.js-toggle-menu');`
	`29`	`+ sideNavToggleButton.addEventListener('click', () => {`
	`30`	`+ navDrawer.toggle();`
`31`	`31`	`});`
`32`	`32`	`}`
`33`	`33`	`}`