Merge pull request #284 from webcomponents/ie10-mo

Prepare for 0.6.1 build.
webcomponents · Apr 13, 2015 · ef29f20 · ef29f20
2 parents 787ca6c + ed39ec0
commit ef29f20
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 6 deletions.
diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "webcomponentsjs",
   "main": "webcomponents.js",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "homepage": "http://webcomponents.org",
   "authors": [
     "The Polymer Authors"

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "webcomponents.js",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "description": "webcomponents.js",
   "main": "webcomponents.js",
   "directories": {

diff --git a/src/CustomElements/CustomElements.js b/src/CustomElements/CustomElements.js
@@ -28,6 +28,7 @@ var file = 'CustomElements.js';
 
 var modules = [
   '../WeakMap/WeakMap.js',
+  '../MutationObserver/MutationObserver.js',
   'base.js',
   'traverse.js',
   'observe.js',

diff --git a/src/CustomElements/build.json b/src/CustomElements/build.json
@@ -1,5 +1,6 @@
 [
   "../WeakMap/WeakMap.js",
+  "../MutationObserver/MutationObserver.js",
   "base.js",
   "traverse.js",
   "observe.js",

diff --git a/src/HTMLImports/HTMLImports.js b/src/HTMLImports/HTMLImports.js
@@ -27,6 +27,7 @@ var file = 'HTMLImports.js';
 
 var modules = [
   '../WeakMap/WeakMap.js',
+  '../MutationObserver/MutationObserver.js',
   'base.js',
   'module.js',
   'path.js',

diff --git a/src/HTMLImports/build.json b/src/HTMLImports/build.json
@@ -1,5 +1,6 @@
 [
   "../WeakMap/WeakMap.js",
+  "../MutationObserver/MutationObserver.js",
   "base.js",
   "module.js",
   "path.js",

diff --git a/src/WebComponents/build/boot.js b/src/WebComponents/build/boot.js
@@ -11,10 +11,10 @@ window.WebComponents = window.WebComponents || {};
 
 // process flags
 (function(scope){
-  
+
   // import
   var flags = scope.flags || {};
-  
+
   var file = 'webcomponents.js';
   var script = document.querySelector('script[src*="' + file + '"]');
 
@@ -34,7 +34,7 @@ window.WebComponents = window.WebComponents || {};
       }
     }
     // log flags
-    if (flags.log) {
+    if (flags.log && flags.log.split) {
       var parts = flags.log.split(',');
       flags.log = {};
       parts.forEach(function(f) {
@@ -48,7 +48,7 @@ window.WebComponents = window.WebComponents || {};
   // Determine default settings.
   // If any of these flags match 'native', then force native ShadowDOM; any
   // other truthy value, or failure to detect native
-  // ShadowDOM, results in polyfill 
+  // ShadowDOM, results in polyfill
   flags.shadow = (flags.shadow || flags.shadowdom || flags.polyfill);
   if (flags.shadow === 'native') {
     flags.shadow = false;