From 4444290321dd7022dff80d25b2a3cfdcdfb697eb Mon Sep 17 00:00:00 2001
From: guybedford <guybedford@gmail.com>
Date: Thu, 27 Mar 2014 11:55:50 -0700
Subject: [PATCH] ie8 global adjustment, lastIndexOf fix

---
 dist/system-amd-production.js     |  6 ++----
 dist/system-amd-production.min.js |  2 +-
 dist/system.js                    | 16 +++++++---------
 dist/system.min.js                |  2 +-
 lib/polyfill-wrapper-start.js     |  4 +---
 lib/system-amd-production.js      |  2 +-
 lib/system-format-amd.js          |  2 +-
 lib/system-formats.js             |  4 ++--
 lib/system-plugins.js             |  6 +++---
 test/tests/shim-map-test.js       |  2 +-
 10 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/dist/system-amd-production.js b/dist/system-amd-production.js
index 2bb24009..c7260d4f 100644
--- a/dist/system-amd-production.js
+++ b/dist/system-amd-production.js
@@ -19,7 +19,7 @@ global.upgradeSystemLoader = function() {
     return -1;
   };
 
-  var sLastIndexOf = String.prototype.lastIndexOf || function(c) {
+  var lastIndexOf = Array.prototype.lastIndexOf || function(c) {
     for (var i = this.length - 1; i >= 0; i--) {
       if (this[i] === c) {
         return i;
@@ -27,8 +27,6 @@ global.upgradeSystemLoader = function() {
     }
     return -i;
   };
-
-  var aLastIndexOf = Array.prototype.lastIndexOf || sLastIndexOf;
 /*
   SystemJS Core
   Adds normalization to the import function, as well as __useDefault support
@@ -266,7 +264,7 @@ global.upgradeSystemLoader = function() {
       })(factory);
 
     for (var i = 0; i < deps.length; i++)
-      if (aLastIndexOf.call(deps, deps[i]) != i)
+      if (lastIndexOf.call(deps, deps[i]) != i)
         deps.splice(i--, 1);
 
     var instantiate = {
diff --git a/dist/system-amd-production.min.js b/dist/system-amd-production.min.js
index f8925d42..e12c17f4 100644
--- a/dist/system-amd-production.min.js
+++ b/dist/system-amd-production.min.js
@@ -5,4 +5,4 @@
  * MIT License
  */
 
-!function(e){e.upgradeSystemLoader=function(){e.upgradeSystemLoader=void 0;var t=Array.prototype.indexOf||function(e){for(var t=0,n=this.length;n>t;t++)if(this[t]===e)return t;return-1},n=String.prototype.lastIndexOf||function(e){for(var t=this.length-1;t>=0;t--)if(this[t]===e)return t;return-t},r=Array.prototype.lastIndexOf||n;!function(e){if("undefined"==typeof System)throw"System not defined. Include the `es6-module-loader.js` polyfill before SystemJS.";var t=System,n=function(e){if(!(e instanceof Module)){for(var t=[],r=0;r<e.length;r++)t[r]=n(e[r]);return t}return e.__useDefault?e["default"]:e};System.getModule=function(e){return n(System.get(e))},System.set("@empty",Module({}));var r=System["import"];System["import"]=function(e,t){return new Promise(function(n){n(System.normalize.call(this,e,t&&t.name,t&&t.address))}).then(function(e){return Promise.resolve(r.call(System,e,t)).then(function(e){return n(e)})})},System.__exec=function(n){try{Function("global","with(global) { "+n.source+" \n }"+(n.address&&!n.source.match(/\/\/[@#] ?(sourceURL|sourceMappingURL)=([^\n'"]+)/)?"\n//# sourceURL="+n.address:"")).call(e,e)}catch(r){throw"SyntaxError"==r.name&&(r.message="Evaluating "+n.address+"\n	"+r.message),r}"@traceur"==n.name&&(e.traceurSystem=e.System,e.System=t)}}("undefined"==typeof window?e:window),function(){function e(e,t){var n=t.split("/"),r=e.split("/");if(n.length>r.length)return 0;for(var s=0;s<n.length;s++)if(r[s]!=n[s])return 0;return n.length}function t(t,n){var r,s,a,i,u=0,o=0;if(n)for(var l in System.map){var m=System.map[l];if("object"==typeof m&&!(e(n,l)<=o))for(var f in m)e(t,f)<=u||(r=f,u=f.split("/").length,s=l,o=l.split("/").length)}r&&(i=t.split("/"),a=i.splice(u,i.length-u).join("/"),t=System.map[s][r]+(a?"/"+a:""),u=0);for(var l in System.map){var m=System.map[l];"string"==typeof m&&(e(t,l)<=u||(r=l,u=l.split("/").length))}return u?(i=t.split("/"),a=i.splice(u,i.length-u).join("/"),System.map[r]+(a?"/"+a:"")):t}System.map=System.map||{};var n=System.normalize;System.normalize=function(e,r,s){return Promise.resolve(n.call(System,e,r,s)).then(function(e){return t(e,r)})}}(),function(e){var t=document.getElementsByTagName("head")[0];System.fetch=function(e){return System.defined[e.name]?"":new Promise(function(r,s){var a=document.createElement("script");a.async=!0,a.addEventListener("load",function(){n&&(System.defined[e.name]=n),n=null,r("")},!1),a.addEventListener("error",function(e){s(e)},!1),a.src=e.address,t.appendChild(a)})};var n=null;e.define=function(t,s,a){"string"!=typeof t&&(a=s,s=t,t=null),s instanceof Array||(a=s,s=[]),"function"!=typeof a&&(a=function(e){return function(){return e}}(a));for(var i=0;i<s.length;i++)r.call(s,s[i])!=i&&s.splice(i--,1);var u={deps:s,execute:function(){for(var t=[],n=0;n<arguments.length;n++)t.push(System.getModule(arguments[n]));var r=a.apply(this,t);return new e.Module(r&&r.__esModule?r:{__useDefault:!0,"default":r})}};t?System.defined[t]=u:n=u},e.define.amd={},System.translate=function(){},System.instantiate=function(){return{deps:[],execute:function(){return new Module({})}}};var s=System.requirejs=function(e,t,n,r){if("object"==typeof e&&!(e instanceof Array))return s.apply(null,Array.prototype.splice.call(arguments,1,arguments.length-1));if(!(e instanceof Array)){if("string"==typeof e)return System.getModule(e);throw"Invalid require"}Promise.all(e.map(function(e){return System["import"](e,r)})).then(function(e){return t.apply(this,e)},n)}}("undefined"!=typeof window?window:e),function(){System.bundles=System.bundles||{};var e=System.fetch;System.fetch=function(n){for(var r in System.bundles)if(-1!=t.call(System.bundles[r],n.name))return Promise.resolve(System.normalize(r)).then(function(e){return System.bundles[e]=System.bundles[e]||System.bundles[r],System.load(e)}).then(function(){return""});return e.apply(this,arguments)};var n=System.locate;System.locate=function(e){return System.bundles[e.name]&&(e.metadata.bundle=!0),n.call(this,e)};var r=System.instantiate;System.instantiate=function(e){return e.metadata.bundle?{deps:[],execute:function(){return System.__exec(e),new Module({})}}:r.apply(this,arguments)}}(),function(){System.defined={},System.register=function(e,t,n){System.defined[e]={deps:t,execute:function(){return Module(n.apply(this,arguments))}}};var e=System.fetch;System.fetch=function(t){return System.defined[t.name]?"":e.apply(this,arguments)};var t=System.instantiate;System.instantiate=function(e){if(System.defined[e.name]){var n=System.defined[e.name];return delete System.defined[e.name],n}return t.apply(this,arguments)}}(),function(){var e=/^(\d+)(?:\.(\d+)(?:\.(\d+)(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?)?)?$/,n=function(e,n){var r,s=e.split("."),a=n.split(".");s[2]&&-1!=(r=t.call(s[2],"-"))&&s.splice(2,1,s[2].substr(0,r),s[2].substr(r+1)),a[2]&&-1!=(r=t.call(a[2],"-"))&&a.splice(2,1,a[2].substr(0,r),a[2].substr(r+1));for(var i=0;i<Math.max(s.length,a.length);i++){if(!s[i])return 1;if(!a[i])return-1;if(s[i]!=a[i])return parseInt(s[i])>parseInt(a[i])?1:-1}return 0},r=System.normalize;System.versions=System.versions||{},System.normalize=function(s,a,i){var u=System.versions;return Promise.resolve(r.call(this,s,a,i)).then(function(r){var s,a,i,o,l=t.call(r,"@");if(-1==l){for(var m in u)if(o=u[m],r.substr(0,m.length)==m&&(i=r.charAt(m.length),!i||"/"==i))return m+"@"+("string"==typeof o?o:o[o.length-1])+r.substr(m.length);return r}s=r.substr(l+1).split("/")[0];var f,d=s.length;if("^"==s.substr(0,1)&&(s=s.substr(1),f=!0),a=s.match(e),!a)return r;f&&(a[2]||(f=!1),a[3]||(a[2]>0?a[3]="0":f=!1)),f&&(a[1]>0?(a[2]||(s=a[1]+".0.0"),a[3]||(s=a[1]+".0"),f=s,a=[a[1]]):a[2]>0?(f=s,a=[0,a[2]]):(f=!1,a=[0,0,a[3]]),s=a.join("."));var c=r.substr(0,l);if(o=u[c]||[],"string"==typeof o&&(o=[o]),!a[3]||f)for(var y=o.length-1;y>=0;y--){var p=o[y];if(p.substr(0,s.length)==s&&p.charAt(s.length).match(/^[\.\-]?$/)&&(!f||f&&-1!=n(p,f)))return c+"@"+p+r.substr(c.length+d+1)}return-1==t.call(o,s)&&(o.push(s),o.sort(n),r=c+"@"+s+r.substr(c.length+d+1),a[3]&&-1!=(l=t.call(o,a[1]+"."+a[2]))&&o.splice(l,1),a[2]&&-1!=(l=t.call(o,a[1]))&&o.splice(l,1),u[c]=1==o.length?o[0]:o),r})}}()},function(){if(!e.System||e.System.registerModule)if("undefined"!=typeof window){var t=document.getElementsByTagName("script"),n=t[t.length-1].src,r=n.substr(0,sLastIndexOf.call(n,"/")+1);document.write('<script type="text/javascript" src="'+r+'es6-module-loader.js" data-init="upgradeSystemLoader"></script>')}else{var s=require("es6-module-loader");e.System=s.System,e.Loader=s.Loader,e.Module=s.Module,module.exports=e.System,e.upgradeSystemLoader()}else e.upgradeSystemLoader()}()}("undefined"!=typeof window?window:global);
\ No newline at end of file
+!function(e){e.upgradeSystemLoader=function(){e.upgradeSystemLoader=void 0;var t=Array.prototype.indexOf||function(e){for(var t=0,n=this.length;n>t;t++)if(this[t]===e)return t;return-1},n=Array.prototype.lastIndexOf||function(e){for(var t=this.length-1;t>=0;t--)if(this[t]===e)return t;return-t};!function(e){if("undefined"==typeof System)throw"System not defined. Include the `es6-module-loader.js` polyfill before SystemJS.";var t=System,n=function(e){if(!(e instanceof Module)){for(var t=[],r=0;r<e.length;r++)t[r]=n(e[r]);return t}return e.__useDefault?e["default"]:e};System.getModule=function(e){return n(System.get(e))},System.set("@empty",Module({}));var r=System["import"];System["import"]=function(e,t){return new Promise(function(n){n(System.normalize.call(this,e,t&&t.name,t&&t.address))}).then(function(e){return Promise.resolve(r.call(System,e,t)).then(function(e){return n(e)})})},System.__exec=function(n){try{Function("global","with(global) { "+n.source+" \n }"+(n.address&&!n.source.match(/\/\/[@#] ?(sourceURL|sourceMappingURL)=([^\n'"]+)/)?"\n//# sourceURL="+n.address:"")).call(e,e)}catch(r){throw"SyntaxError"==r.name&&(r.message="Evaluating "+n.address+"\n	"+r.message),r}"@traceur"==n.name&&(e.traceurSystem=e.System,e.System=t)}}("undefined"==typeof window?e:window),function(){function e(e,t){var n=t.split("/"),r=e.split("/");if(n.length>r.length)return 0;for(var s=0;s<n.length;s++)if(r[s]!=n[s])return 0;return n.length}function t(t,n){var r,s,a,i,u=0,o=0;if(n)for(var l in System.map){var m=System.map[l];if("object"==typeof m&&!(e(n,l)<=o))for(var f in m)e(t,f)<=u||(r=f,u=f.split("/").length,s=l,o=l.split("/").length)}r&&(i=t.split("/"),a=i.splice(u,i.length-u).join("/"),t=System.map[s][r]+(a?"/"+a:""),u=0);for(var l in System.map){var m=System.map[l];"string"==typeof m&&(e(t,l)<=u||(r=l,u=l.split("/").length))}return u?(i=t.split("/"),a=i.splice(u,i.length-u).join("/"),System.map[r]+(a?"/"+a:"")):t}System.map=System.map||{};var n=System.normalize;System.normalize=function(e,r,s){return Promise.resolve(n.call(System,e,r,s)).then(function(e){return t(e,r)})}}(),function(e){var t=document.getElementsByTagName("head")[0];System.fetch=function(e){return System.defined[e.name]?"":new Promise(function(n,s){var a=document.createElement("script");a.async=!0,a.addEventListener("load",function(){r&&(System.defined[e.name]=r),r=null,n("")},!1),a.addEventListener("error",function(e){s(e)},!1),a.src=e.address,t.appendChild(a)})};var r=null;e.define=function(t,s,a){"string"!=typeof t&&(a=s,s=t,t=null),s instanceof Array||(a=s,s=[]),"function"!=typeof a&&(a=function(e){return function(){return e}}(a));for(var i=0;i<s.length;i++)n.call(s,s[i])!=i&&s.splice(i--,1);var u={deps:s,execute:function(){for(var t=[],n=0;n<arguments.length;n++)t.push(System.getModule(arguments[n]));var r=a.apply(this,t);return new e.Module(r&&r.__esModule?r:{__useDefault:!0,"default":r})}};t?System.defined[t]=u:r=u},e.define.amd={},System.translate=function(){},System.instantiate=function(){return{deps:[],execute:function(){return new Module({})}}};var s=System.requirejs=function(e,t,n,r){if("object"==typeof e&&!(e instanceof Array))return s.apply(null,Array.prototype.splice.call(arguments,1,arguments.length-1));if(!(e instanceof Array)){if("string"==typeof e)return System.getModule(e);throw"Invalid require"}Promise.all(e.map(function(e){return System["import"](e,r)})).then(function(e){return t.apply(this,e)},n)}}("undefined"!=typeof window?window:e),function(){System.bundles=System.bundles||{};var e=System.fetch;System.fetch=function(n){for(var r in System.bundles)if(-1!=t.call(System.bundles[r],n.name))return Promise.resolve(System.normalize(r)).then(function(e){return System.bundles[e]=System.bundles[e]||System.bundles[r],System.load(e)}).then(function(){return""});return e.apply(this,arguments)};var n=System.locate;System.locate=function(e){return System.bundles[e.name]&&(e.metadata.bundle=!0),n.call(this,e)};var r=System.instantiate;System.instantiate=function(e){return e.metadata.bundle?{deps:[],execute:function(){return System.__exec(e),new Module({})}}:r.apply(this,arguments)}}(),function(){System.defined={},System.register=function(e,t,n){System.defined[e]={deps:t,execute:function(){return Module(n.apply(this,arguments))}}};var e=System.fetch;System.fetch=function(t){return System.defined[t.name]?"":e.apply(this,arguments)};var t=System.instantiate;System.instantiate=function(e){if(System.defined[e.name]){var n=System.defined[e.name];return delete System.defined[e.name],n}return t.apply(this,arguments)}}(),function(){var e=/^(\d+)(?:\.(\d+)(?:\.(\d+)(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?)?)?$/,n=function(e,n){var r,s=e.split("."),a=n.split(".");s[2]&&-1!=(r=t.call(s[2],"-"))&&s.splice(2,1,s[2].substr(0,r),s[2].substr(r+1)),a[2]&&-1!=(r=t.call(a[2],"-"))&&a.splice(2,1,a[2].substr(0,r),a[2].substr(r+1));for(var i=0;i<Math.max(s.length,a.length);i++){if(!s[i])return 1;if(!a[i])return-1;if(s[i]!=a[i])return parseInt(s[i])>parseInt(a[i])?1:-1}return 0},r=System.normalize;System.versions=System.versions||{},System.normalize=function(s,a,i){var u=System.versions;return Promise.resolve(r.call(this,s,a,i)).then(function(r){var s,a,i,o,l=t.call(r,"@");if(-1==l){for(var m in u)if(o=u[m],r.substr(0,m.length)==m&&(i=r.charAt(m.length),!i||"/"==i))return m+"@"+("string"==typeof o?o:o[o.length-1])+r.substr(m.length);return r}s=r.substr(l+1).split("/")[0];var f,d=s.length;if("^"==s.substr(0,1)&&(s=s.substr(1),f=!0),a=s.match(e),!a)return r;f&&(a[2]||(f=!1),a[3]||(a[2]>0?a[3]="0":f=!1)),f&&(a[1]>0?(a[2]||(s=a[1]+".0.0"),a[3]||(s=a[1]+".0"),f=s,a=[a[1]]):a[2]>0?(f=s,a=[0,a[2]]):(f=!1,a=[0,0,a[3]]),s=a.join("."));var c=r.substr(0,l);if(o=u[c]||[],"string"==typeof o&&(o=[o]),!a[3]||f)for(var y=o.length-1;y>=0;y--){var p=o[y];if(p.substr(0,s.length)==s&&p.charAt(s.length).match(/^[\.\-]?$/)&&(!f||f&&-1!=n(p,f)))return c+"@"+p+r.substr(c.length+d+1)}return-1==t.call(o,s)&&(o.push(s),o.sort(n),r=c+"@"+s+r.substr(c.length+d+1),a[3]&&-1!=(l=t.call(o,a[1]+"."+a[2]))&&o.splice(l,1),a[2]&&-1!=(l=t.call(o,a[1]))&&o.splice(l,1),u[c]=1==o.length?o[0]:o),r})}}()},function(){if(!e.System||e.System.registerModule)if("undefined"!=typeof window){var t=document.getElementsByTagName("script"),n=t[t.length-1].src,r=n.substr(0,sLastIndexOf.call(n,"/")+1);document.write('<script type="text/javascript" src="'+r+'es6-module-loader.js" data-init="upgradeSystemLoader"></script>')}else{var s=require("es6-module-loader");e.System=s.System,e.Loader=s.Loader,e.Module=s.Module,module.exports=e.System,e.upgradeSystemLoader()}else e.upgradeSystemLoader()}()}("undefined"!=typeof window?window:global);
\ No newline at end of file
diff --git a/dist/system.js b/dist/system.js
index e9eb6942..7b386163 100644
--- a/dist/system.js
+++ b/dist/system.js
@@ -19,7 +19,7 @@ global.upgradeSystemLoader = function() {
     return -1;
   };
 
-  var sLastIndexOf = String.prototype.lastIndexOf || function(c) {
+  var lastIndexOf = Array.prototype.lastIndexOf || function(c) {
     for (var i = this.length - 1; i >= 0; i--) {
       if (this[i] === c) {
         return i;
@@ -27,8 +27,6 @@ global.upgradeSystemLoader = function() {
     }
     return -i;
   };
-
-  var aLastIndexOf = Array.prototype.lastIndexOf || sLastIndexOf;
 /*
   SystemJS Core
   Adds normalization to the import function, as well as __useDefault support
@@ -136,7 +134,7 @@ global.upgradeSystemLoader = function() {
     var curScript = document.getElementsByTagName('script');
     curScript = curScript[curScript.length - 1];
     // set the path to traceur
-    var traceurSrc = curScript.getAttribute('data-traceur-src') || curScript.src.substr(0, sLastIndexOf.call(curScript.src, '/') + 1) + 'traceur.js';
+    var traceurSrc = curScript.getAttribute('data-traceur-src') || curScript.src.substr(0, curScript.src.lastIndexOf('/') + 1) + 'traceur.js';
   }
 
   // also in ESML, build.js
@@ -214,7 +212,7 @@ global.upgradeSystemLoader = function() {
 
     // remove duplicates from deps first
     for (var i = 0; i < deps.length; i++)
-      if (aLastIndexOf.call(deps, deps[i]) != i)
+      if (lastIndexOf.call(deps, deps[i]) != i)
         deps.splice(i--, 1);
 
     return {
@@ -278,7 +276,7 @@ global.upgradeSystemLoader = function() {
 
   function prepareDeps(deps, meta) {
     for (var i = 0; i < deps.length; i++)
-      if (aLastIndexOf.call(deps, deps[i]) != i)
+      if (lastIndexOf.call(deps, deps[i]) != i)
         deps.splice(i--, 1);
 
     // remove system dependencies
@@ -761,12 +759,12 @@ global.upgradeSystemLoader = function() {
     return Promise.resolve(systemNormalize(name, parentName, parentAddress))
     .then(function(name) {
       // if this is a plugin, normalize the plugin name and the argument
-      var pluginIndex = sLastIndexOf.call(name, '!');
+      var pluginIndex = name.lastIndexOf('!');
       if (pluginIndex != -1) {
         var argumentName = name.substr(0, pluginIndex);
 
         // plugin name is part after "!" or the extension itself
-        var pluginName = name.substr(pluginIndex + 1) || argumentName.substr(sLastIndexOf.call(argumentName, '.') + 1);
+        var pluginName = name.substr(pluginIndex + 1) || argumentName.substr(argumentName.lastIndexOf('.') + 1);
 
         // normalize the plugin name relative to the same parent
         return new Promise(function(resolve) {
@@ -792,7 +790,7 @@ global.upgradeSystemLoader = function() {
     var name = load.name;
 
     // plugin
-    var pluginIndex = sLastIndexOf.call(name, '!');
+    var pluginIndex = name.lastIndexOf('!');
     if (pluginIndex != -1) {
       var pluginName = name.substr(pluginIndex + 1);
 
diff --git a/dist/system.min.js b/dist/system.min.js
index 8ea4a372..69d062b4 100644
--- a/dist/system.min.js
+++ b/dist/system.min.js
@@ -5,4 +5,4 @@
  * MIT License
  */
 
-!function(e){e.upgradeSystemLoader=function(){e.upgradeSystemLoader=void 0;var t=Array.prototype.indexOf||function(e){for(var t=0,r=this.length;r>t;t++)if(this[t]===e)return t;return-1},r=String.prototype.lastIndexOf||function(e){for(var t=this.length-1;t>=0;t--)if(this[t]===e)return t;return-t},n=Array.prototype.lastIndexOf||r;!function(e){if("undefined"==typeof System)throw"System not defined. Include the `es6-module-loader.js` polyfill before SystemJS.";var t=System,r=function(e){if(!(e instanceof Module)){for(var t=[],n=0;n<e.length;n++)t[n]=r(e[n]);return t}return e.__useDefault?e["default"]:e};System.getModule=function(e){return r(System.get(e))},System.set("@empty",Module({}));var n=System["import"];System["import"]=function(e,t){return new Promise(function(r){r(System.normalize.call(this,e,t&&t.name,t&&t.address))}).then(function(e){return Promise.resolve(n.call(System,e,t)).then(function(e){return r(e)})})},System.__exec=function(r){try{Function("global","with(global) { "+r.source+" \n }"+(r.address&&!r.source.match(/\/\/[@#] ?(sourceURL|sourceMappingURL)=([^\n'"]+)/)?"\n//# sourceURL="+r.address:"")).call(e,e)}catch(n){throw"SyntaxError"==n.name&&(n.message="Evaluating "+r.address+"\n	"+n.message),n}"@traceur"==r.name&&(e.traceurSystem=e.System,e.System=t)}}("undefined"==typeof window?e:window),function(e){if(System.format={},System.formats=[],"undefined"!=typeof window){var t=document.getElementsByTagName("script");t=t[t.length-1];var s=t.getAttribute("data-traceur-src")||t.src.substr(0,r.call(t.src,"/")+1)+"traceur.js"}var a=/(?:^\s*|[}{\(\);,\n]\s*)(import\s+['"]|(import|module)\s+[^"'\(\)\n;]+\s+from\s+['"]|export\s+(\*|\{|default|function|var|const|let|[_$a-zA-Z\xA0-\uFFFF][_$a-zA-Z0-9\xA0-\uFFFF]*))/,o=/^\s*export\s*\*\s*from\s*(?:'([^']+)'|"([^"]+)")/,u=/^(\s*(\/\*.*\*\/)|(\/\/[^\n]*))*(["']use strict["'];?)?["']([^'"]+)["'][;\n]/,i=System.instantiate;System.instantiate=function(t){var r=t.name||"";t.source=t.source||"";var l=t.metadata.format;if(!l){var m=t.source.match(u);m&&(l=t.metadata.format=m[5])}"@traceur"==r&&(l="global");var c;if(!e.traceur&&("es6"==l||!l)&&(c=t.source.match(o)))return{deps:[c[1]||c[2]],execute:function(e){return System.get(e)}};if("es6"==l||!l&&t.source.match(a))return e.traceur?i.call(System,t):System["import"]("@traceur",{address:s}).then(function(){return i.call(System,t)});if(System.shim&&System.shim[t.name]&&(l="global"),!l||!this.format[l])for(var f=0;f<this.formats.length;f++){var d=this.formats[f],p=this.format[d];if(p.detect(t)){l=d;break}}var p=this.format[l];if(!l||!p)throw new TypeError("No format found for "+(l?l:t.address));for(var y=p.deps(t,e),f=0;f<y.length;f++)n.call(y,y[f])!=f&&y.splice(f--,1);return{deps:y,execute:function(){var r=p.execute.call(this,Array.prototype.splice.call(arguments,0,arguments.length),t,e);return r instanceof e.Module?r:new e.Module(r&&r.__esModule?r:{__useDefault:!0,"default":r})}}}}("undefined"!=typeof window?window:e),function(){function e(e,r,n){return function(s,a,u){return"string"==typeof s&&-1!=t.call(r,s)?System.getModule(n[t.call(r,s)]):o(s,a,u,{name:e})}}function r(e,r){for(var s=0;s<e.length;s++)n.call(e,e[s])!=s&&e.splice(s--,1);var a;return-1!=(a=t.call(e,"require"))&&(r.requireIndex=a,e.splice(a,1)),-1!=(a=t.call(e,"exports"))&&(r.exportsIndex=a,e.splice(a,1)),-1!=(a=t.call(e,"module"))&&(r.moduleIndex=a,e.splice(a,1)),e}function s(t,r){for(var n=r.metadata,s=[],a=0;a<t.length;a++){var o=System.get(t[a]);if(o.__useDefault)o=o["default"];else if(!o.__esModule){var u={__esModule:!0};for(var i in o)u[i]=o[i];o=u}s[a]=o}var o,l;return void 0!==n.moduleIndex&&s.splice(n.moduleIndex,0,l={},o={id:r.name,uri:r.address,config:function(){return{}},exports:l}),void 0!==n.exportsIndex&&s.splice(n.exportsIndex,0,l=l||{}),void 0!==n.requireIndex&&s.splice(n.requireIndex,0,e(r.name,n.deps,t)),{deps:s,module:o||l&&{exports:l}}}System.formats.push("amd");var a=/(?:^\s*|[}{\(\);,\n\?\&]\s*)define\s*\(\s*("[^"]+"\s*,|'[^']+'\s*,\s*)?(\[(\s*("[^"]+"|'[^']+')\s*,)*(\s*("[^"]+"|'[^']+')\s*)?\]|function\s*|{|[_$a-zA-Z\xA0-\uFFFF][_$a-zA-Z0-9\xA0-\uFFFF]*\))/,o=System.require=function(e,t,r,n){if("object"==typeof e&&!(e instanceof Array))return o.apply(null,Array.prototype.splice.call(arguments,1,arguments.length-1));if(!(e instanceof Array)){if("string"==typeof e)return System.getModule(e);throw"Invalid require"}Promise.all(e.map(function(e){return System["import"](e,n)})).then(function(e){t.apply(null,e)},r)};System.format.amd={detect:function(e){return!!e.source.match(a)},deps:function(e,t){var n,a=e.metadata,o=!1;return t.define=function(u,i,l){if(!o){if("string"!=typeof u?(l=i,i=u,u=null):a.bundle||(u=null),u||(o=!0),!(i instanceof Array)){l=i;var m=e.source;e.source=l.toString(),i=["require","exports","module"].concat(System.format.cjs.deps(e,t)),e.source=m}if("function"!=typeof l&&(l=function(e){return function(){return e}}(l)),u&&u!=e.name){var c={name:u,address:u,metadata:{}};i=r(i,c.metadata),System.defined[u]={deps:i,execute:function(){var e=s(Array.prototype.splice.call(arguments,0,arguments.length),c),r=l.apply(t,e.deps)||e.module&&e.module.exports;return r instanceof t.Module?r:new t.Module(r&&r.__esModule?r:{__useDefault:!0,"default":r})}}}else n=i,a.factory=l}},t.define.amd={},t.module=void 0,t.exports=void 0,System.__exec(e),n=n||[],n=r(n,a),t.define=void 0,a.deps=n,n},execute:function(e,t,r){if(t.metadata.factory){var n=s(e,t);return t.metadata.factory.apply(r,n.deps)||n.module&&n.module.exports}}}}(),function(){System.formats.push("cjs");var e=/(?:^\s*|[}{\(\);,\n=:\?\&]\s*|module\.)(exports\s*\[\s*('[^']+'|"[^"]+")\s*\]|\exports\s*\.\s*[_$a-zA-Z\xA0-\uFFFF][_$a-zA-Z0-9\xA0-\uFFFF]*|exports\s*\=)/,r=/(?:^\s*|[}{\(\);,\n=:\?\&]\s*)require\s*\(\s*("([^"]+)"|'([^']+)')\s*\)/g,n=/(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/gm,s=function(){},a={nextTick:function(e){setTimeout(e,7)},browser:!0,env:{},argv:[],on:s,once:s,off:s,emit:s,cwd:function(){return"/"}};System.set("@@nodeProcess",Module(a)),System.format.cjs={detect:function(t){return e.lastIndex=0,r.lastIndex=0,!(!r.exec(t.source)&&!e.exec(t.source))},deps:function(t){e.lastIndex=0,r.lastIndex=0;for(var s,a=[],o=t.source.replace(n,"");s=r.exec(o);)a.push(s[2]||s[3]);return t.metadata.deps=a,a},execute:function(e,r,n){var s=r.address.split("/");s.pop(),s=s.join("/");var o=r.metadata.deps,u=n._g={global:n,exports:{},process:a,require:function(r){var n=t.call(o,r);return-1!=n?System.getModule(e[n]):void 0},__filename:r.address,__dirname:s};u.module={exports:u.exports};var i="";for(var l in u)i+="var "+l+" = _g."+l+";";return r.source=i+r.source,System.__exec(r),n._g=void 0,u.module.exports}}}(),function(){System.formats.push("global");var e=/(["']global["'];\s*)((['"]import [^'"]+['"];\s*)*)(['"]export ([^'"]+)["'])?/,t=/(["']import [^'"]+)+/g,r={};System.shim={},System.format.global={detect:function(){return!0},deps:function(r){var n,s;if(n=r.source.match(e)){if(s=n[2].match(t))for(var a=0;a<s.length;a++)s[a]=s[a].substr(8);r.metadata.globalExport=n[5]}s=s||[];var o;return(o=System.shim[r.name])&&("object"==typeof o&&(o.exports&&(r.metadata.globalExport=o.exports),(o.deps||o.imports)&&(o=o.deps||o.imports)),o instanceof Array&&(s=s.concat(o))),s},execute:function(e,t,n){for(var s=n.hasOwnProperty,a=t.metadata.globalExport,o=0;o<e.length;o++){var u=r[e[o]];if(u)for(var i in u)n[i]=u[i]}var l={};for(var m in n)(!s||n.hasOwnProperty(m))&&(l[m]=n[m]);a&&(t.source+='\nthis["'+a+'"] = '+a),System.__exec(t);var c,u;if(a){var f=a.split(".")[0];c=eval.call(n,a),u={},u[f]=n[f]}else{u={};for(var m in n)(s||"sessionStorage"!=m&&"localStorage"!=m&&"clipboardData"!=m&&"frames"!=m)&&(s&&!n.hasOwnProperty(m)||m==n||l[m]==n[m]||(u[m]=n[m],c?c!==n[m]&&(c=!1):c!==!1&&(c=n[m])))}return r[t.name]=u,c?c:new Module(u)}}}(),function(){function e(e,t){var r=t.split("/"),n=e.split("/");if(r.length>n.length)return 0;for(var s=0;s<r.length;s++)if(n[s]!=r[s])return 0;return r.length}function t(t,r){var n,s,a,o,u=0,i=0;if(r)for(var l in System.map){var m=System.map[l];if("object"==typeof m&&!(e(r,l)<=i))for(var c in m)e(t,c)<=u||(n=c,u=c.split("/").length,s=l,i=l.split("/").length)}n&&(o=t.split("/"),a=o.splice(u,o.length-u).join("/"),t=System.map[s][n]+(a?"/"+a:""),u=0);for(var l in System.map){var m=System.map[l];"string"==typeof m&&(e(t,l)<=u||(n=l,u=l.split("/").length))}return u?(o=t.split("/"),a=o.splice(u,o.length-u).join("/"),System.map[n]+(a?"/"+a:"")):t}System.map=System.map||{};var r=System.normalize;System.normalize=function(e,n,s){return Promise.resolve(r.call(System,e,n,s)).then(function(e){return t(e,n)})}}(),function(){var e=System.normalize;System.normalize=function(n,s,a){var o;return s&&-1!=(o=t.call(s,"!"))&&(s=s.substr(0,o)),Promise.resolve(e(n,s,a)).then(function(e){var t=r.call(e,"!");if(-1!=t){var n=e.substr(0,t),o=e.substr(t+1)||n.substr(r.call(n,".")+1);return new Promise(function(e){e(System.normalize(o,s,a))}).then(function(e){return o=e,System.normalize(n,s,a)}).then(function(e){return e+"!"+o})}return e})};var n=System.locate;System.locate=function(e){var t=e.name,s=r.call(t,"!");if(-1!=s){var a=t.substr(s+1);return e.name=t.substr(0,s),System.load(a).then(function(){var t=System.get(a);return t=t["default"]||t,e.metadata.plugin=t,e.metadata.pluginName=a,e.metadata.pluginArgument=e.name,t.locate?t.locate.call(System,e):new Promise(function(t){t(System.locate(e))}).then(function(e){return e.substr(0,e.length-3)})})}return n.call(this,e)};var s=System.fetch;System.fetch=function(e){var t=this;return"function"==typeof e.metadata.plugin?new Promise(function(r,n){e.metadata.plugin(e.metadata.pluginArgument,e.address,function(r,n,a){s.call(t,{name:e.name,address:r,metadata:{}}).then(n,a)},r,n)}):(e.metadata.plugin&&e.metadata.plugin.fetch||s).call(this,e)};var a=System.translate;System.translate=function(e){var t=e.metadata.plugin;return t&&t.translate?t.translate.call(this,e):a.call(this,e)}}(),function(){System.bundles=System.bundles||{};var e=System.fetch;System.fetch=function(r){for(var n in System.bundles)if(-1!=t.call(System.bundles[n],r.name))return Promise.resolve(System.normalize(n)).then(function(e){return System.bundles[e]=System.bundles[e]||System.bundles[n],System.load(e)}).then(function(){return""});return e.apply(this,arguments)};var r=System.locate;System.locate=function(e){return System.bundles[e.name]&&(e.metadata.bundle=!0),r.call(this,e)};var n=System.instantiate;System.instantiate=function(e){return e.metadata.bundle?{deps:[],execute:function(){return System.__exec(e),new Module({})}}:n.apply(this,arguments)}}(),function(){System.defined={},System.register=function(e,t,r){System.defined[e]={deps:t,execute:function(){return Module(r.apply(this,arguments))}}};var e=System.fetch;System.fetch=function(t){return System.defined[t.name]?"":e.apply(this,arguments)};var t=System.instantiate;System.instantiate=function(e){if(System.defined[e.name]){var r=System.defined[e.name];return delete System.defined[e.name],r}return t.apply(this,arguments)}}(),function(){var e=/^(\d+)(?:\.(\d+)(?:\.(\d+)(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?)?)?$/,r=function(e,r){var n,s=e.split("."),a=r.split(".");s[2]&&-1!=(n=t.call(s[2],"-"))&&s.splice(2,1,s[2].substr(0,n),s[2].substr(n+1)),a[2]&&-1!=(n=t.call(a[2],"-"))&&a.splice(2,1,a[2].substr(0,n),a[2].substr(n+1));for(var o=0;o<Math.max(s.length,a.length);o++){if(!s[o])return 1;if(!a[o])return-1;if(s[o]!=a[o])return parseInt(s[o])>parseInt(a[o])?1:-1}return 0},n=System.normalize;System.versions=System.versions||{},System.normalize=function(s,a,o){var u=System.versions;return Promise.resolve(n.call(this,s,a,o)).then(function(n){var s,a,o,i,l=t.call(n,"@");if(-1==l){for(var m in u)if(i=u[m],n.substr(0,m.length)==m&&(o=n.charAt(m.length),!o||"/"==o))return m+"@"+("string"==typeof i?i:i[i.length-1])+n.substr(m.length);return n}s=n.substr(l+1).split("/")[0];var c,f=s.length;if("^"==s.substr(0,1)&&(s=s.substr(1),c=!0),a=s.match(e),!a)return n;c&&(a[2]||(c=!1),a[3]||(a[2]>0?a[3]="0":c=!1)),c&&(a[1]>0?(a[2]||(s=a[1]+".0.0"),a[3]||(s=a[1]+".0"),c=s,a=[a[1]]):a[2]>0?(c=s,a=[0,a[2]]):(c=!1,a=[0,0,a[3]]),s=a.join("."));var d=n.substr(0,l);if(i=u[d]||[],"string"==typeof i&&(i=[i]),!a[3]||c)for(var p=i.length-1;p>=0;p--){var y=i[p];if(y.substr(0,s.length)==s&&y.charAt(s.length).match(/^[\.\-]?$/)&&(!c||c&&-1!=r(y,c)))return d+"@"+y+n.substr(d.length+f+1)}return-1==t.call(i,s)&&(i.push(s),i.sort(r),n=d+"@"+s+n.substr(d.length+f+1),a[3]&&-1!=(l=t.call(i,a[1]+"."+a[2]))&&i.splice(l,1),a[2]&&-1!=(l=t.call(i,a[1]))&&i.splice(l,1),u[d]=1==i.length?i[0]:i),n})}}()},function(){if(!e.System||e.System.registerModule)if("undefined"!=typeof window){var t=document.getElementsByTagName("script"),r=t[t.length-1].src,n=r.substr(0,sLastIndexOf.call(r,"/")+1);document.write('<script type="text/javascript" src="'+n+'es6-module-loader.js" data-init="upgradeSystemLoader"></script>')}else{var s=require("es6-module-loader");e.System=s.System,e.Loader=s.Loader,e.Module=s.Module,module.exports=e.System,e.upgradeSystemLoader()}else e.upgradeSystemLoader()}()}("undefined"!=typeof window?window:global);
\ No newline at end of file
+!function(e){e.upgradeSystemLoader=function(){e.upgradeSystemLoader=void 0;var t=Array.prototype.indexOf||function(e){for(var t=0,r=this.length;r>t;t++)if(this[t]===e)return t;return-1},r=Array.prototype.lastIndexOf||function(e){for(var t=this.length-1;t>=0;t--)if(this[t]===e)return t;return-t};!function(e){if("undefined"==typeof System)throw"System not defined. Include the `es6-module-loader.js` polyfill before SystemJS.";var t=System,r=function(e){if(!(e instanceof Module)){for(var t=[],n=0;n<e.length;n++)t[n]=r(e[n]);return t}return e.__useDefault?e["default"]:e};System.getModule=function(e){return r(System.get(e))},System.set("@empty",Module({}));var n=System["import"];System["import"]=function(e,t){return new Promise(function(r){r(System.normalize.call(this,e,t&&t.name,t&&t.address))}).then(function(e){return Promise.resolve(n.call(System,e,t)).then(function(e){return r(e)})})},System.__exec=function(r){try{Function("global","with(global) { "+r.source+" \n }"+(r.address&&!r.source.match(/\/\/[@#] ?(sourceURL|sourceMappingURL)=([^\n'"]+)/)?"\n//# sourceURL="+r.address:"")).call(e,e)}catch(n){throw"SyntaxError"==n.name&&(n.message="Evaluating "+r.address+"\n	"+n.message),n}"@traceur"==r.name&&(e.traceurSystem=e.System,e.System=t)}}("undefined"==typeof window?e:window),function(e){if(System.format={},System.formats=[],"undefined"!=typeof window){var t=document.getElementsByTagName("script");t=t[t.length-1];var n=t.getAttribute("data-traceur-src")||t.src.substr(0,t.src.lastIndexOf("/")+1)+"traceur.js"}var s=/(?:^\s*|[}{\(\);,\n]\s*)(import\s+['"]|(import|module)\s+[^"'\(\)\n;]+\s+from\s+['"]|export\s+(\*|\{|default|function|var|const|let|[_$a-zA-Z\xA0-\uFFFF][_$a-zA-Z0-9\xA0-\uFFFF]*))/,a=/^\s*export\s*\*\s*from\s*(?:'([^']+)'|"([^"]+)")/,o=/^(\s*(\/\*.*\*\/)|(\/\/[^\n]*))*(["']use strict["'];?)?["']([^'"]+)["'][;\n]/,u=System.instantiate;System.instantiate=function(t){var i=t.name||"";t.source=t.source||"";var l=t.metadata.format;if(!l){var m=t.source.match(o);m&&(l=t.metadata.format=m[5])}"@traceur"==i&&(l="global");var c;if(!e.traceur&&("es6"==l||!l)&&(c=t.source.match(a)))return{deps:[c[1]||c[2]],execute:function(e){return System.get(e)}};if("es6"==l||!l&&t.source.match(s))return e.traceur?u.call(System,t):System["import"]("@traceur",{address:n}).then(function(){return u.call(System,t)});if(System.shim&&System.shim[t.name]&&(l="global"),!l||!this.format[l])for(var f=0;f<this.formats.length;f++){var d=this.formats[f],p=this.format[d];if(p.detect(t)){l=d;break}}var p=this.format[l];if(!l||!p)throw new TypeError("No format found for "+(l?l:t.address));for(var y=p.deps(t,e),f=0;f<y.length;f++)r.call(y,y[f])!=f&&y.splice(f--,1);return{deps:y,execute:function(){var r=p.execute.call(this,Array.prototype.splice.call(arguments,0,arguments.length),t,e);return r instanceof e.Module?r:new e.Module(r&&r.__esModule?r:{__useDefault:!0,"default":r})}}}}("undefined"!=typeof window?window:e),function(){function e(e,r,n){return function(s,a,u){return"string"==typeof s&&-1!=t.call(r,s)?System.getModule(n[t.call(r,s)]):o(s,a,u,{name:e})}}function n(e,n){for(var s=0;s<e.length;s++)r.call(e,e[s])!=s&&e.splice(s--,1);var a;return-1!=(a=t.call(e,"require"))&&(n.requireIndex=a,e.splice(a,1)),-1!=(a=t.call(e,"exports"))&&(n.exportsIndex=a,e.splice(a,1)),-1!=(a=t.call(e,"module"))&&(n.moduleIndex=a,e.splice(a,1)),e}function s(t,r){for(var n=r.metadata,s=[],a=0;a<t.length;a++){var o=System.get(t[a]);if(o.__useDefault)o=o["default"];else if(!o.__esModule){var u={__esModule:!0};for(var i in o)u[i]=o[i];o=u}s[a]=o}var o,l;return void 0!==n.moduleIndex&&s.splice(n.moduleIndex,0,l={},o={id:r.name,uri:r.address,config:function(){return{}},exports:l}),void 0!==n.exportsIndex&&s.splice(n.exportsIndex,0,l=l||{}),void 0!==n.requireIndex&&s.splice(n.requireIndex,0,e(r.name,n.deps,t)),{deps:s,module:o||l&&{exports:l}}}System.formats.push("amd");var a=/(?:^\s*|[}{\(\);,\n\?\&]\s*)define\s*\(\s*("[^"]+"\s*,|'[^']+'\s*,\s*)?(\[(\s*("[^"]+"|'[^']+')\s*,)*(\s*("[^"]+"|'[^']+')\s*)?\]|function\s*|{|[_$a-zA-Z\xA0-\uFFFF][_$a-zA-Z0-9\xA0-\uFFFF]*\))/,o=System.require=function(e,t,r,n){if("object"==typeof e&&!(e instanceof Array))return o.apply(null,Array.prototype.splice.call(arguments,1,arguments.length-1));if(!(e instanceof Array)){if("string"==typeof e)return System.getModule(e);throw"Invalid require"}Promise.all(e.map(function(e){return System["import"](e,n)})).then(function(e){t.apply(null,e)},r)};System.format.amd={detect:function(e){return!!e.source.match(a)},deps:function(e,t){var r,a=e.metadata,o=!1;return t.define=function(u,i,l){if(!o){if("string"!=typeof u?(l=i,i=u,u=null):a.bundle||(u=null),u||(o=!0),!(i instanceof Array)){l=i;var m=e.source;e.source=l.toString(),i=["require","exports","module"].concat(System.format.cjs.deps(e,t)),e.source=m}if("function"!=typeof l&&(l=function(e){return function(){return e}}(l)),u&&u!=e.name){var c={name:u,address:u,metadata:{}};i=n(i,c.metadata),System.defined[u]={deps:i,execute:function(){var e=s(Array.prototype.splice.call(arguments,0,arguments.length),c),r=l.apply(t,e.deps)||e.module&&e.module.exports;return r instanceof t.Module?r:new t.Module(r&&r.__esModule?r:{__useDefault:!0,"default":r})}}}else r=i,a.factory=l}},t.define.amd={},t.module=void 0,t.exports=void 0,System.__exec(e),r=r||[],r=n(r,a),t.define=void 0,a.deps=r,r},execute:function(e,t,r){if(t.metadata.factory){var n=s(e,t);return t.metadata.factory.apply(r,n.deps)||n.module&&n.module.exports}}}}(),function(){System.formats.push("cjs");var e=/(?:^\s*|[}{\(\);,\n=:\?\&]\s*|module\.)(exports\s*\[\s*('[^']+'|"[^"]+")\s*\]|\exports\s*\.\s*[_$a-zA-Z\xA0-\uFFFF][_$a-zA-Z0-9\xA0-\uFFFF]*|exports\s*\=)/,r=/(?:^\s*|[}{\(\);,\n=:\?\&]\s*)require\s*\(\s*("([^"]+)"|'([^']+)')\s*\)/g,n=/(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/gm,s=function(){},a={nextTick:function(e){setTimeout(e,7)},browser:!0,env:{},argv:[],on:s,once:s,off:s,emit:s,cwd:function(){return"/"}};System.set("@@nodeProcess",Module(a)),System.format.cjs={detect:function(t){return e.lastIndex=0,r.lastIndex=0,!(!r.exec(t.source)&&!e.exec(t.source))},deps:function(t){e.lastIndex=0,r.lastIndex=0;for(var s,a=[],o=t.source.replace(n,"");s=r.exec(o);)a.push(s[2]||s[3]);return t.metadata.deps=a,a},execute:function(e,r,n){var s=r.address.split("/");s.pop(),s=s.join("/");var o=r.metadata.deps,u=n._g={global:n,exports:{},process:a,require:function(r){var n=t.call(o,r);return-1!=n?System.getModule(e[n]):void 0},__filename:r.address,__dirname:s};u.module={exports:u.exports};var i="";for(var l in u)i+="var "+l+" = _g."+l+";";return r.source=i+r.source,System.__exec(r),n._g=void 0,u.module.exports}}}(),function(){System.formats.push("global");var e=/(["']global["'];\s*)((['"]import [^'"]+['"];\s*)*)(['"]export ([^'"]+)["'])?/,t=/(["']import [^'"]+)+/g,r={};System.shim={},System.format.global={detect:function(){return!0},deps:function(r){var n,s;if(n=r.source.match(e)){if(s=n[2].match(t))for(var a=0;a<s.length;a++)s[a]=s[a].substr(8);r.metadata.globalExport=n[5]}s=s||[];var o;return(o=System.shim[r.name])&&("object"==typeof o&&(o.exports&&(r.metadata.globalExport=o.exports),(o.deps||o.imports)&&(o=o.deps||o.imports)),o instanceof Array&&(s=s.concat(o))),s},execute:function(e,t,n){for(var s=n.hasOwnProperty,a=t.metadata.globalExport,o=0;o<e.length;o++){var u=r[e[o]];if(u)for(var i in u)n[i]=u[i]}var l={};for(var m in n)(!s||n.hasOwnProperty(m))&&(l[m]=n[m]);a&&(t.source+='\nthis["'+a+'"] = '+a),System.__exec(t);var c,u;if(a){var f=a.split(".")[0];c=eval.call(n,a),u={},u[f]=n[f]}else{u={};for(var m in n)(s||"sessionStorage"!=m&&"localStorage"!=m&&"clipboardData"!=m&&"frames"!=m)&&(s&&!n.hasOwnProperty(m)||m==n||l[m]==n[m]||(u[m]=n[m],c?c!==n[m]&&(c=!1):c!==!1&&(c=n[m])))}return r[t.name]=u,c?c:new Module(u)}}}(),function(){function e(e,t){var r=t.split("/"),n=e.split("/");if(r.length>n.length)return 0;for(var s=0;s<r.length;s++)if(n[s]!=r[s])return 0;return r.length}function t(t,r){var n,s,a,o,u=0,i=0;if(r)for(var l in System.map){var m=System.map[l];if("object"==typeof m&&!(e(r,l)<=i))for(var c in m)e(t,c)<=u||(n=c,u=c.split("/").length,s=l,i=l.split("/").length)}n&&(o=t.split("/"),a=o.splice(u,o.length-u).join("/"),t=System.map[s][n]+(a?"/"+a:""),u=0);for(var l in System.map){var m=System.map[l];"string"==typeof m&&(e(t,l)<=u||(n=l,u=l.split("/").length))}return u?(o=t.split("/"),a=o.splice(u,o.length-u).join("/"),System.map[n]+(a?"/"+a:"")):t}System.map=System.map||{};var r=System.normalize;System.normalize=function(e,n,s){return Promise.resolve(r.call(System,e,n,s)).then(function(e){return t(e,n)})}}(),function(){var e=System.normalize;System.normalize=function(r,n,s){var a;return n&&-1!=(a=t.call(n,"!"))&&(n=n.substr(0,a)),Promise.resolve(e(r,n,s)).then(function(e){var t=e.lastIndexOf("!");if(-1!=t){var r=e.substr(0,t),a=e.substr(t+1)||r.substr(r.lastIndexOf(".")+1);return new Promise(function(e){e(System.normalize(a,n,s))}).then(function(e){return a=e,System.normalize(r,n,s)}).then(function(e){return e+"!"+a})}return e})};var r=System.locate;System.locate=function(e){var t=e.name,n=t.lastIndexOf("!");if(-1!=n){var s=t.substr(n+1);return e.name=t.substr(0,n),System.load(s).then(function(){var t=System.get(s);return t=t["default"]||t,e.metadata.plugin=t,e.metadata.pluginName=s,e.metadata.pluginArgument=e.name,t.locate?t.locate.call(System,e):new Promise(function(t){t(System.locate(e))}).then(function(e){return e.substr(0,e.length-3)})})}return r.call(this,e)};var n=System.fetch;System.fetch=function(e){var t=this;return"function"==typeof e.metadata.plugin?new Promise(function(r,s){e.metadata.plugin(e.metadata.pluginArgument,e.address,function(r,s,a){n.call(t,{name:e.name,address:r,metadata:{}}).then(s,a)},r,s)}):(e.metadata.plugin&&e.metadata.plugin.fetch||n).call(this,e)};var s=System.translate;System.translate=function(e){var t=e.metadata.plugin;return t&&t.translate?t.translate.call(this,e):s.call(this,e)}}(),function(){System.bundles=System.bundles||{};var e=System.fetch;System.fetch=function(r){for(var n in System.bundles)if(-1!=t.call(System.bundles[n],r.name))return Promise.resolve(System.normalize(n)).then(function(e){return System.bundles[e]=System.bundles[e]||System.bundles[n],System.load(e)}).then(function(){return""});return e.apply(this,arguments)};var r=System.locate;System.locate=function(e){return System.bundles[e.name]&&(e.metadata.bundle=!0),r.call(this,e)};var n=System.instantiate;System.instantiate=function(e){return e.metadata.bundle?{deps:[],execute:function(){return System.__exec(e),new Module({})}}:n.apply(this,arguments)}}(),function(){System.defined={},System.register=function(e,t,r){System.defined[e]={deps:t,execute:function(){return Module(r.apply(this,arguments))}}};var e=System.fetch;System.fetch=function(t){return System.defined[t.name]?"":e.apply(this,arguments)};var t=System.instantiate;System.instantiate=function(e){if(System.defined[e.name]){var r=System.defined[e.name];return delete System.defined[e.name],r}return t.apply(this,arguments)}}(),function(){var e=/^(\d+)(?:\.(\d+)(?:\.(\d+)(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?)?)?$/,r=function(e,r){var n,s=e.split("."),a=r.split(".");s[2]&&-1!=(n=t.call(s[2],"-"))&&s.splice(2,1,s[2].substr(0,n),s[2].substr(n+1)),a[2]&&-1!=(n=t.call(a[2],"-"))&&a.splice(2,1,a[2].substr(0,n),a[2].substr(n+1));for(var o=0;o<Math.max(s.length,a.length);o++){if(!s[o])return 1;if(!a[o])return-1;if(s[o]!=a[o])return parseInt(s[o])>parseInt(a[o])?1:-1}return 0},n=System.normalize;System.versions=System.versions||{},System.normalize=function(s,a,o){var u=System.versions;return Promise.resolve(n.call(this,s,a,o)).then(function(n){var s,a,o,i,l=t.call(n,"@");if(-1==l){for(var m in u)if(i=u[m],n.substr(0,m.length)==m&&(o=n.charAt(m.length),!o||"/"==o))return m+"@"+("string"==typeof i?i:i[i.length-1])+n.substr(m.length);return n}s=n.substr(l+1).split("/")[0];var c,f=s.length;if("^"==s.substr(0,1)&&(s=s.substr(1),c=!0),a=s.match(e),!a)return n;c&&(a[2]||(c=!1),a[3]||(a[2]>0?a[3]="0":c=!1)),c&&(a[1]>0?(a[2]||(s=a[1]+".0.0"),a[3]||(s=a[1]+".0"),c=s,a=[a[1]]):a[2]>0?(c=s,a=[0,a[2]]):(c=!1,a=[0,0,a[3]]),s=a.join("."));var d=n.substr(0,l);if(i=u[d]||[],"string"==typeof i&&(i=[i]),!a[3]||c)for(var p=i.length-1;p>=0;p--){var y=i[p];if(y.substr(0,s.length)==s&&y.charAt(s.length).match(/^[\.\-]?$/)&&(!c||c&&-1!=r(y,c)))return d+"@"+y+n.substr(d.length+f+1)}return-1==t.call(i,s)&&(i.push(s),i.sort(r),n=d+"@"+s+n.substr(d.length+f+1),a[3]&&-1!=(l=t.call(i,a[1]+"."+a[2]))&&i.splice(l,1),a[2]&&-1!=(l=t.call(i,a[1]))&&i.splice(l,1),u[d]=1==i.length?i[0]:i),n})}}()},function(){if(!e.System||e.System.registerModule)if("undefined"!=typeof window){var t=document.getElementsByTagName("script"),r=t[t.length-1].src,n=r.substr(0,sLastIndexOf.call(r,"/")+1);document.write('<script type="text/javascript" src="'+n+'es6-module-loader.js" data-init="upgradeSystemLoader"></script>')}else{var s=require("es6-module-loader");e.System=s.System,e.Loader=s.Loader,e.Module=s.Module,module.exports=e.System,e.upgradeSystemLoader()}else e.upgradeSystemLoader()}()}("undefined"!=typeof window?window:global);
\ No newline at end of file
diff --git a/lib/polyfill-wrapper-start.js b/lib/polyfill-wrapper-start.js
index 7d7b53e8..f47e1cbf 100644
--- a/lib/polyfill-wrapper-start.js
+++ b/lib/polyfill-wrapper-start.js
@@ -12,7 +12,7 @@ global.upgradeSystemLoader = function() {
     return -1;
   };
 
-  var sLastIndexOf = String.prototype.lastIndexOf || function(c) {
+  var lastIndexOf = Array.prototype.lastIndexOf || function(c) {
     for (var i = this.length - 1; i >= 0; i--) {
       if (this[i] === c) {
         return i;
@@ -20,5 +20,3 @@ global.upgradeSystemLoader = function() {
     }
     return -i;
   };
-
-  var aLastIndexOf = Array.prototype.lastIndexOf || sLastIndexOf;
diff --git a/lib/system-amd-production.js b/lib/system-amd-production.js
index d6ccff39..d6c548e1 100644
--- a/lib/system-amd-production.js
+++ b/lib/system-amd-production.js
@@ -45,7 +45,7 @@
       })(factory);
 
     for (var i = 0; i < deps.length; i++)
-      if (aLastIndexOf.call(deps, deps[i]) != i)
+      if (lastIndexOf.call(deps, deps[i]) != i)
         deps.splice(i--, 1);
 
     var instantiate = {
diff --git a/lib/system-format-amd.js b/lib/system-format-amd.js
index c2ddfec5..bd448aeb 100644
--- a/lib/system-format-amd.js
+++ b/lib/system-format-amd.js
@@ -45,7 +45,7 @@
 
   function prepareDeps(deps, meta) {
     for (var i = 0; i < deps.length; i++)
-      if (aLastIndexOf.call(deps, deps[i]) != i)
+      if (lastIndexOf.call(deps, deps[i]) != i)
         deps.splice(i--, 1);
 
     // remove system dependencies
diff --git a/lib/system-formats.js b/lib/system-formats.js
index ddfadc18..57533c3b 100644
--- a/lib/system-formats.js
+++ b/lib/system-formats.js
@@ -29,7 +29,7 @@
     var curScript = document.getElementsByTagName('script');
     curScript = curScript[curScript.length - 1];
     // set the path to traceur
-    var traceurSrc = curScript.getAttribute('data-traceur-src') || curScript.src.substr(0, sLastIndexOf.call(curScript.src, '/') + 1) + 'traceur.js';
+    var traceurSrc = curScript.getAttribute('data-traceur-src') || curScript.src.substr(0, curScript.src.lastIndexOf('/') + 1) + 'traceur.js';
   }
 
   // also in ESML, build.js
@@ -107,7 +107,7 @@
 
     // remove duplicates from deps first
     for (var i = 0; i < deps.length; i++)
-      if (aLastIndexOf.call(deps, deps[i]) != i)
+      if (lastIndexOf.call(deps, deps[i]) != i)
         deps.splice(i--, 1);
 
     return {
diff --git a/lib/system-plugins.js b/lib/system-plugins.js
index 2110edf9..60559fe1 100644
--- a/lib/system-plugins.js
+++ b/lib/system-plugins.js
@@ -17,12 +17,12 @@
     return Promise.resolve(systemNormalize(name, parentName, parentAddress))
     .then(function(name) {
       // if this is a plugin, normalize the plugin name and the argument
-      var pluginIndex = sLastIndexOf.call(name, '!');
+      var pluginIndex = name.lastIndexOf('!');
       if (pluginIndex != -1) {
         var argumentName = name.substr(0, pluginIndex);
 
         // plugin name is part after "!" or the extension itself
-        var pluginName = name.substr(pluginIndex + 1) || argumentName.substr(sLastIndexOf.call(argumentName, '.') + 1);
+        var pluginName = name.substr(pluginIndex + 1) || argumentName.substr(argumentName.lastIndexOf('.') + 1);
 
         // normalize the plugin name relative to the same parent
         return new Promise(function(resolve) {
@@ -48,7 +48,7 @@
     var name = load.name;
 
     // plugin
-    var pluginIndex = sLastIndexOf.call(name, '!');
+    var pluginIndex = name.lastIndexOf('!');
     if (pluginIndex != -1) {
       var pluginName = name.substr(pluginIndex + 1);
 
diff --git a/test/tests/shim-map-test.js b/test/tests/shim-map-test.js
index 58922056..31ee6b32 100644
--- a/test/tests/shim-map-test.js
+++ b/test/tests/shim-map-test.js
@@ -1 +1 @@
-shimdep = shimmapdep;
\ No newline at end of file
+window.shimdep = shimmapdep;
\ No newline at end of file