From f76ed8a556b8a1ebb5121271dc72227c7a7290fb Mon Sep 17 00:00:00 2001
From: Volker Thiel <volker.thiel@mage-profis.de>
Date: Tue, 22 Sep 2015 09:23:40 +0200
Subject: [PATCH 1/3] Fixed modal dialogue

---
 .../default/template/catalog/product/view/media.phtml         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/design/frontend/boilerplate/default/template/catalog/product/view/media.phtml b/app/design/frontend/boilerplate/default/template/catalog/product/view/media.phtml
index 2dd25e69..aa3d1cd9 100644
--- a/app/design/frontend/boilerplate/default/template/catalog/product/view/media.phtml
+++ b/app/design/frontend/boilerplate/default/template/catalog/product/view/media.phtml
@@ -71,7 +71,7 @@ $index = 0;
 ?>
 <?php if ($baseImageFile): ?>
     <div class="product-image product-image-zoom">
-        <a href="#product-media-modal" data-toggle="media" data-index="<?php echo $index++ ?>">
+        <a href="#product-media-modal" data-toggle="modal" data-index="<?php echo $index++ ?>">
             <img src="<?php echo $this->helper('catalog/image')->init($product, 'image')->resize($baseImageSize['x'], $baseImageSize['y']) ?>" alt="<?php echo $this->htmlEscape($this->getImageLabel()) ?>">
         </a>
     </div>
@@ -82,7 +82,7 @@ $index = 0;
         <ul>
             <?php foreach ($galleryImages as $image): ?>
                 <li>
-                    <a href="#product-media-modal" data-toggle="media" data-index="<?php echo $index++ ?>">
+                    <a href="#product-media-modal" data-toggle="modal" data-index="<?php echo $index++ ?>">
                         <img src="<?php echo $this->helper('catalog/image')->init($product, 'image', $image->getFile())->resize($galleryImageSize['x'], $galleryImageSize['y']) ?>" alt="<?php echo $this->htmlEscape($image->getLabel()) ?>">
                     </a>
                 </li>

From 2c1b71deb8c586da770a32e30ac43f9f66ef1dab Mon Sep 17 00:00:00 2001
From: Volker Thiel <volker.thiel@mage-profis.de>
Date: Thu, 1 Oct 2015 16:49:36 +0200
Subject: [PATCH 2/3] Merge frequently used Magento JS files into one file

This minimizes additional HTTP requests while still maintaining the possibility for third-party modules to add custom JS and maybe even merging JS files from backend config (untested!).
Fixes #100 and addresses #111
---
 .../default/layout/magentoboilerplate.xml     | 14 ++++++++
 skin/frontend/boilerplate/default/gulpfile.js | 34 ++++++++++++++++---
 .../frontend/boilerplate/default/package.json |  1 +
 3 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/app/design/frontend/boilerplate/default/layout/magentoboilerplate.xml b/app/design/frontend/boilerplate/default/layout/magentoboilerplate.xml
index e624fb19..a6e41003 100644
--- a/app/design/frontend/boilerplate/default/layout/magentoboilerplate.xml
+++ b/app/design/frontend/boilerplate/default/layout/magentoboilerplate.xml
@@ -62,10 +62,24 @@
 				<name>varien/menu.js</name>
 			</action>
 
+			<action method="removeItem"><type>js</type><file>prototype/prototype.js</file></action>
+			<action method="removeItem"><type>js</type><file>lib/ccard.js</file></action>
+			<action method="removeItem"><type>js</type><file>prototype/validation.js</file></action>
+			<action method="removeItem"><type>js</type><file>scriptaculous/builder.js</file></action>
+			<action method="removeItem"><type>js</type><file>scriptaculous/effects.js</file></action>
+			<action method="removeItem"><type>js</type><file>scriptaculous/dragdrop.js</file></action>
+			<action method="removeItem"><type>js</type><file>scriptaculous/controls.js</file></action>
+			<action method="removeItem"><type>js</type><file>scriptaculous/slider.js</file></action>
+			<action method="removeItem"><type>js</type><file>varien/js.js</file></action>
+			<action method="removeItem"><type>js</type><file>varien/form.js</file></action>
+			<action method="removeItem"><type>js</type><file>mage/translate.js</file></action>
+			<action method="removeItem"><type>js</type><file>mage/cookies.js</file></action>
+
 			<!-- Add our assets -->
 			<action method="addCss">
 				<stylesheet>css/style.css</stylesheet>
 			</action>
+			<action method="addJs"><name>mage.js</name></action>
 			<action method="addItem">
 				<type>skin_js</type>
 				<name>js/script.js</name>
diff --git a/skin/frontend/boilerplate/default/gulpfile.js b/skin/frontend/boilerplate/default/gulpfile.js
index 3fb5c8cd..0564baf4 100644
--- a/skin/frontend/boilerplate/default/gulpfile.js
+++ b/skin/frontend/boilerplate/default/gulpfile.js
@@ -32,6 +32,7 @@ var
   concat       = require('gulp-concat'),
   notify       = require('gulp-notify'),
   cache        = require('gulp-cache'),
+  merge        = require('merge-stream'),
   livereload   = require('gulp-livereload');
 
 var config = {
@@ -67,6 +68,28 @@ gulp.task('css', function() {
 
 // JS
 gulp.task('js', function() {
+  var core = [
+    '../../../../js/prototype/prototype.js',
+    '../../../../js/lib/ccard.js',
+    '../../../../js/prototype/validation.js',
+
+    // Scriptaculous is not needed when using bootstrap
+    // '../../../../js/scriptaculous/builder.js',
+    // '../../../../js/scriptaculous/effects.js',
+    // '../../../../js/scriptaculous/dragdrop.js',
+    // '../../../../js/scriptaculous/controls.js',
+    // '../../../../js/scriptaculous/slider.js',
+
+    '../../../../js/varien/js.js',
+    '../../../../js/varien/form.js',
+    '../../../../js/mage/translate.js',
+    '../../../../js/mage/cookies.js'
+  ];
+
+  var mage = gulp
+    .src(core)
+    .pipe(concat('mage.js'));
+
   var scripts = [
     'bower_components/jquery/dist/jquery.js',
     'bower_components/bootstrap/js/transition.js',
@@ -81,16 +104,19 @@ gulp.task('js', function() {
     scripts.push('src/js/livereload.js');
   }
 
-  var stream = gulp
+  var boilerplate = gulp
     .src(scripts)
     .pipe(concat('script.js'));
 
   if (config.uglifyJS === true) {
-    stream.pipe(uglify());
+    mage.pipe(uglify());
+    boilerplate.pipe(uglify());
   }
 
-  return stream
-    .pipe(gulp.dest('js'))
+  mage.pipe(gulp.dest('../../../../js')); // Put concated mage core js file in /js
+  boilerplate.pipe(gulp.dest('js'));
+
+  return merge(mage, boilerplate)
     .pipe(notify({ message: 'Successfully compiled JavaScript' }));
 });
 
diff --git a/skin/frontend/boilerplate/default/package.json b/skin/frontend/boilerplate/default/package.json
index 4fc11a02..c11ec4c6 100644
--- a/skin/frontend/boilerplate/default/package.json
+++ b/skin/frontend/boilerplate/default/package.json
@@ -11,6 +11,7 @@
     "gulp-notify": "^1.4.0",
     "gulp-rimraf": "^0.1.0",
     "gulp-uglify": "^0.3.1",
+    "merge-stream": "~1.0",
 	"bower": "~1.3.5",
     "grunt": "~0.4.5",
     "grunt-autoprefixer": "~0.8.1",

From faf1e2f50c12034e4676f470ede5bc8d5262ac5c Mon Sep 17 00:00:00 2001
From: Volker Thiel <volker.thiel@mage-profis.de>
Date: Tue, 6 Oct 2015 11:07:46 +0200
Subject: [PATCH 3/3] No mangling of variable names

---
 skin/frontend/boilerplate/default/gulpfile.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/skin/frontend/boilerplate/default/gulpfile.js b/skin/frontend/boilerplate/default/gulpfile.js
index 0564baf4..d0dba98a 100644
--- a/skin/frontend/boilerplate/default/gulpfile.js
+++ b/skin/frontend/boilerplate/default/gulpfile.js
@@ -109,7 +109,7 @@ gulp.task('js', function() {
     .pipe(concat('script.js'));
 
   if (config.uglifyJS === true) {
-    mage.pipe(uglify());
+    mage.pipe(uglify({"mangle":false})); // Do not rename super global variables as it breaks prototype functionality
     boilerplate.pipe(uglify());
   }