Merge pull request #284 from webcomponents/ie10-mo

Prepare for 0.6.1 build.
This commit is contained in:
Addy Osmani
2015-04-13 21:42:20 +01:00
7 changed files with 10 additions and 6 deletions

View File

@@ -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"

View File

@@ -1,6 +1,6 @@
{
"name": "webcomponents.js",
"version": "0.6.0",
"version": "0.6.1",
"description": "webcomponents.js",
"main": "webcomponents.js",
"directories": {

View File

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

View File

@@ -1,5 +1,6 @@
[
"../WeakMap/WeakMap.js",
"../MutationObserver/MutationObserver.js",
"base.js",
"traverse.js",
"observe.js",

View File

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

View File

@@ -1,5 +1,6 @@
[
"../WeakMap/WeakMap.js",
"../MutationObserver/MutationObserver.js",
"base.js",
"module.js",
"path.js",

View File

@@ -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;