0.6.1

systemjs · May 19, 2014 · 6c4e67b · 6c4e67b
1 parent d32d27e
commit 6c4e67b
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 27 deletions.
diff --git a/README.md b/README.md
@@ -23,7 +23,7 @@ Basic Configuration
 
 ### Setup
 
-Download [`es6-module-loader.js`](https://github.com/ModuleLoader/es6-module-loader/blob/v0.6.0/dist/es6-module-loader.js) and [`traceur.js`](https://github.com/google/traceur-compiler/blob/0.0.41/bin/traceur.js) and locate them in the same folder as `system.js` from this repo.
+Download [`es6-module-loader.js`](https://github.com/ModuleLoader/es6-module-loader/blob/v0.6.1/dist/es6-module-loader.js) and [`traceur.js`](https://github.com/google/traceur-compiler/blob/0.0.42/bin/traceur.js) and locate them in the same folder as `system.js` from this repo.
 
 We then include `dist/system.js` with a script tag in the page.
 

diff --git a/bower.json b/bower.json
@@ -1,8 +1,8 @@
 {
   "name": "system.js",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "dependencies": {
-    "es6-module-loader": "~0.6.0"
+    "es6-module-loader": "~0.6.1"
   },
   "devDependencies": {
     "qunit": "~1.12.0"

diff --git a/dist/system-production-csp.js b/dist/system-production-csp.js
@@ -1,5 +1,5 @@
 /*
- * SystemJS v0.6.0
+ * SystemJS v0.6.1
  * 
  * Copyright (c) 2014 Guy Bedford
  * MIT License
@@ -1809,10 +1809,13 @@ bundles(System);
 versions(System);
 depCache(System);
 
-  if (__$curScript && !System.paths['@traceur'])
-    System.paths['@traceur'] = typeof __$curScript != 'undefined' && __$curScript.getAttribute('data-traceur-src') 
-      || System.baseURL + (System.baseURL.lastIndexOf('/') == System.baseURL.length - 1 ? '' : '/') + 'traceur.js';
-
+
+  if (!System.paths['@traceur'])
+    System.paths['@traceur'] = __$curScript && __$curScript.getAttribute('data-traceur-src')
+      || (__$curScript && __$curScript.src 
+        ? __$curScript.src.substr(0, __$curScript.src.lastIndexOf('/') + 1) 
+        : System.baseURL + (System.baseURL.lastIndexOf('/') == System.baseURL.length - 1 ? '' : '/')
+        ) + 'traceur.js';
 };
 
 function __eval(__source, __global, __address, __sourceMap) {
@@ -1858,4 +1861,4 @@ var __$curScript;
   }
 })(__$global);
 
-})(typeof window != 'undefined' ? window : global);
+})(typeof window != 'undefined' ? window : global);
diff --git a/dist/system-production-csp.min.js b/dist/system-production-csp.min.js
diff --git a/dist/system.js b/dist/system.js
@@ -1,5 +1,5 @@
 /*
- * SystemJS v0.6.0
+ * SystemJS v0.6.1
  * 
  * Copyright (c) 2014 Guy Bedford
  * MIT License
@@ -1884,10 +1884,13 @@ bundles(System);
 versions(System);
 depCache(System);
 
-  if (__$curScript && !System.paths['@traceur'])
-    System.paths['@traceur'] = typeof __$curScript != 'undefined' && __$curScript.getAttribute('data-traceur-src') 
-      || System.baseURL + (System.baseURL.lastIndexOf('/') == System.baseURL.length - 1 ? '' : '/') + 'traceur.js';
-
+
+  if (!System.paths['@traceur'])
+    System.paths['@traceur'] = __$curScript && __$curScript.getAttribute('data-traceur-src')
+      || (__$curScript && __$curScript.src 
+        ? __$curScript.src.substr(0, __$curScript.src.lastIndexOf('/') + 1) 
+        : System.baseURL + (System.baseURL.lastIndexOf('/') == System.baseURL.length - 1 ? '' : '/')
+        ) + 'traceur.js';
 };
 
 function __eval(__source, __global, __address, __sourceMap) {
@@ -1933,4 +1936,4 @@ var __$curScript;
   }
 })(__$global);
 
-})(typeof window != 'undefined' ? window : global);
+})(typeof window != 'undefined' ? window : global);
diff --git a/dist/system.min.js b/dist/system.min.js
diff --git a/lib/banner.js b/lib/banner.js
@@ -1,5 +1,5 @@
 /*
- * SystemJS v0.6.0
+ * SystemJS v0.6.1
  * 
  * Copyright (c) 2014 Guy Bedford
  * MIT License

diff --git a/lib/polyfill-wrapper-end.js b/lib/polyfill-wrapper-end.js
@@ -1,8 +1,11 @@
 
-  if (__$curScript && !System.paths['@traceur'])
-    System.paths['@traceur'] = typeof __$curScript != 'undefined' && __$curScript.getAttribute('data-traceur-src') 
-      || System.baseURL + (System.baseURL.lastIndexOf('/') == System.baseURL.length - 1 ? '' : '/') + 'traceur.js';
-
+
+  if (!System.paths['@traceur'])
+    System.paths['@traceur'] = __$curScript && __$curScript.getAttribute('data-traceur-src')
+      || (__$curScript && __$curScript.src 
+        ? __$curScript.src.substr(0, __$curScript.src.lastIndexOf('/') + 1) 
+        : System.baseURL + (System.baseURL.lastIndexOf('/') == System.baseURL.length - 1 ? '' : '/')
+        ) + 'traceur.js';
 };
 
 function __eval(__source, __global, __address, __sourceMap) {
@@ -48,4 +51,4 @@ var __$curScript;
   }
 })(__$global);
 
-})(typeof window != 'undefined' ? window : global);
+})(typeof window != 'undefined' ? window : global);
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "systemjs",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "description": "System loader extension for flexible AMD & CommonJS support",
   "main": "dist/system.js",
   "repository": {
@@ -10,7 +10,7 @@
   "author": "Guy Bedford",
   "license": "MIT",
   "dependencies": {
-    "es6-module-loader": "~0.6.0"
+    "es6-module-loader": "~0.6.1"
   },
   "devDependencies": {
     "qunit": "^0.6.2",