8000 4/17 master -> stable by dfreedm · Pull Request #5 · googlearchive/platform · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content
This repository was archived by the owner on Mar 13, 2018. It is now read-only.

4/17 master -> stable #5

Merged
merged 30 commits into from
Apr 17, 2013
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
445ce32
fresh HTMLImports submodule.
sorvell Apr 12, 2013
ea94528
freshen builds.
sorvell Apr 12, 2013
dc8a9e2
freshen submodule and builds.
Apr 12, 2013
c0ebe06
update pointergestures
dfreedm Apr 12, 2013
cfc2571
freshen HTMLImports submodule
Apr 12, 2013
a2066e0
test -> tools
Apr 12, 2013
842b025
Merge branch 'master' of https://github.com/toolkitchen/platform
Apr 12, 2013
722f2cc
add '.git' extension to tools submodule url
Apr 12, 2013
6999ab8
freshen builds.
Apr 12, 2013
7e3ebf7
freshen builds.
Apr 12, 2013
232a9a1
modernize tools
Apr 13, 2013
916bd52
employ loader tool
Apr 13, 2013
e650abc
tests for new dev loader
Apr 13, 2013
d752e36
improved build system + tests; now we produce an all-purpose build (p…
Apr 13, 2013
69f4919
update tools, CustomElements; modify platform.js for latest loader
Apr 13, 2013
27eaff0
rev submodules
Apr 13, 2013
ac88f93
fix MDV loader path
Apr 13, 2013
e3b6a14
rev builds
Apr 13, 2013
453ccb5
rev
Apr 13, 2013
f70d248
remove bogus test case
Apr 13, 2013
ec3396d
rev tools
Apr 13, 2013
c082768
rev CustomElements and build
Apr 15, 2013
20c6773
include 'grunt-contrib-concat' in package.json
Apr 15, 2013
7ac4af4
8000 remove double slash from path to loader.js
Apr 15, 2013
8427c74
remove extra slash
Apr 15, 2013
6e2ab6f
rev submodules
Apr 15, 2013
d964e8d
Merge branch 'master' of https://github.com/toolkitchen/platform
Apr 15, 2013
3a9588e
freshen submodule.
sorvell Apr 17, 2013
338512b
freshen builds.
sorvell Apr 17, 2013
fe6215d
Merge branch 'stable'
dfreedm Apr 17, 2013
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
/node_modules
/docs

/test.bat
/node_modules
/docs

/test.bat

/build/shadowdom.conditional.js
6 changes: 3 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
[submodule "buildbot"]
path = buildbot
url = https://github.com/toolkitchen/buildbot.git
[submodule "lib/test"]
path = lib/test
url = https://github.com/toolkitchen/test
[submodule "tools"]
path = tools
url = https://github.com/toolkitchen/tools.git
2 changes: 1 addition & 1 deletion CustomElements
2 changes: 1 addition & 1 deletion MDV
Submodule MDV updated 108 files
2 changes: 1 addition & 1 deletion PointerGestures
2 changes: 1 addition & 1 deletion ShadowDOM
2 changes: 1 addition & 1 deletion WebAnimations
1 change: 1 addition & 0 deletions build/else.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
} else {
1 change: 1 addition & 0 deletions build/end-if.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
}
22 changes: 22 additions & 0 deletions build/if-poly.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
// prepoulate window.Platform.flags for default controls
window.Platform = window.Platform || {};
// prepopulate window.logFlags if necessary
window.logFlags = window.logFlags || {};
// process flags
(function(scope){
// import
var flags = scope.flags || {};
// populate flags from location
location.search.slice(1).split('&').forEach(function(o) {
o = o.split('=');
o[0] && (flags[o[0]] = o[1] || true);
});
// failure to detect native shadowDOM, or a 'truthy' value for any of these
// flags results in polyfill
flags.shadow = (flags.shadowdom || flags.shadow || flags.polyfill ||
!HTMLElement.prototype.webkitCreateShadowRoot) && 'polyfill';
// export
scope.flags = flags;
})(Platform);
// select ShadowDOM impl
if (Platform.flags.shadow === 'polyfill') {
4 changes: 2 additions & 2 deletions conf/karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ basePath = '../';
files = [
MOCHA,
MOCHA_ADAPTER,
'lib/test/mocha-htmltest.js',
'tools/test/mocha-htmltest.js',
'conf/mocha.conf.js',
'node_modules/chai/chai.js',
'test/js/*.js',
Expand All @@ -23,7 +23,7 @@ files = [
// {pattern: 'PointerGestures/**/*', included: false},
// {pattern: 'ShadowDOM/**/*', included: false},
// {pattern: 'WebAnimations/**/*', included: false},
{pattern: 'lib/**/*.js', included: false},
{pattern: 'tools/**/*.js', included: false},
{pattern: 'platform.*', included: false},
{pattern: 'test/**/*.html', included: false},
{pattern: 'test/**/*.js', included: false}
Expand Down
Loading
0