update search css loading

This commit is contained in:
Luke Pulverenti 2015-12-02 15:50:25 -05:00
parent 96eb9ea63a
commit 3118991c21
15 changed files with 161 additions and 190 deletions

View file

@ -6,11 +6,10 @@
self.upload = function (file, name, url) { self.upload = function (file, name, url) {
var deferred = DeferredBuilder.Deferred(); return new Promise(function (resolve, reject) {
deferred.reject(); reject();
});
return deferred.promise();
}; };
} }

View file

@ -31,6 +31,6 @@
"commit": "34fc5e4a0f252964ed2790138b8d7d30d04b55c1" "commit": "34fc5e4a0f252964ed2790138b8d7d30d04b55c1"
}, },
"_source": "git://github.com/desandro/get-style-property.git", "_source": "git://github.com/desandro/get-style-property.git",
"_target": "1.x", "_target": "~1.0.4",
"_originalSource": "get-style-property" "_originalSource": "get-style-property"
} }

View file

@ -1,6 +1,6 @@
{ {
"name": "paper-checkbox", "name": "paper-checkbox",
"version": "1.0.15", "version": "1.0.16",
"description": "A material design checkbox", "description": "A material design checkbox",
"authors": [ "authors": [
"The Polymer Authors" "The Polymer Authors"
@ -29,18 +29,19 @@
}, },
"devDependencies": { "devDependencies": {
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0", "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0",
"web-component-tester": "*", "web-component-tester": "polymer/web-component-tester#^3.4.0",
"test-fixture": "PolymerElements/test-fixture#^1.0.0", "test-fixture": "PolymerElements/test-fixture#^1.0.0",
"iron-component-page": "PolymerElements/iron-component-page#^1.0.0", "iron-component-page": "PolymerElements/iron-component-page#^1.0.0",
"iron-demo-helpers": "PolymerElements/iron-demo-helpers#^1.0.0",
"iron-flex-layout": "PolymerElements/iron-flex-layout#^1.0.0", "iron-flex-layout": "PolymerElements/iron-flex-layout#^1.0.0",
"iron-test-helpers": "PolymerElements/iron-test-helpers#^1.0.0" "iron-test-helpers": "PolymerElements/iron-test-helpers#^1.0.0"
}, },
"main": "paper-checkbox.html", "main": "paper-checkbox.html",
"_release": "1.0.15", "_release": "1.0.16",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.0.15", "tag": "v1.0.16",
"commit": "fe884a3da56b03998731d5ae299dd2fe893b3b8a" "commit": "5bfe12e9a096664c3f199d654c890d2a8d2def31"
}, },
"_source": "git://github.com/PolymerElements/paper-checkbox.git", "_source": "git://github.com/PolymerElements/paper-checkbox.git",
"_target": "~1.0.5", "_target": "~1.0.5",

View file

@ -5,13 +5,15 @@ before_script:
- npm install bower - npm install bower
- 'export PATH=$PWD/node_modules/.bin:$PATH' - 'export PATH=$PWD/node_modules/.bin:$PATH'
- bower install - bower install
- npm install polylint
- polylint
env: env:
global: global:
- secure: PkxMaBcKe8HD1Jv8O6qiyQ4Nux6DfaVyN/ss9opajX9Oqa2ECJRI/OCsjDSrgXKhuAc2dw0L/KwSb/j4hg3/9BzHlJYQmeR9b9+MsO377TseNw5aKlywgVRu2bj8ODv2naQ4pB4B/Us/n9K7J0vlHIwM8UAJJwGjYm2oYTQxCAw= - secure: PkxMaBcKe8HD1Jv8O6qiyQ4Nux6DfaVyN/ss9opajX9Oqa2ECJRI/OCsjDSrgXKhuAc2dw0L/KwSb/j4hg3/9BzHlJYQmeR9b9+MsO377TseNw5aKlywgVRu2bj8ODv2naQ4pB4B/Us/n9K7J0vlHIwM8UAJJwGjYm2oYTQxCAw=
- secure: WQNRMEQEm6k5e+rzN08Lg0IBC83AZLz1QLP89z59JHLrAOeBu7CBh/LFG0OkhUnTC+dG2JdfIZbdQVCEciDyONjSIKzmM4ze9/LrGzFpROE8bU0ylYSLqX+3CK/6i7VMR3pJo79e1KOeprppHiJSRLVBJfhG+5uNgwAXws/sLQ4= - secure: WQNRMEQEm6k5e+rzN08Lg0IBC83AZLz1QLP89z59JHLrAOeBu7CBh/LFG0OkhUnTC+dG2JdfIZbdQVCEciDyONjSIKzmM4ze9/LrGzFpROE8bU0ylYSLqX+3CK/6i7VMR3pJo79e1KOeprppHiJSRLVBJfhG+5uNgwAXws/sLQ4=
node_js: 4 node_js: 4
addons: addons:
firefox: '42.0' firefox: latest
apt: apt:
sources: sources:
- google-chrome - google-chrome

View file

@ -1,6 +1,6 @@
{ {
"name": "paper-checkbox", "name": "paper-checkbox",
"version": "1.0.15", "version": "1.0.16",
"description": "A material design checkbox", "description": "A material design checkbox",
"authors": [ "authors": [
"The Polymer Authors" "The Polymer Authors"
@ -29,9 +29,10 @@
}, },
"devDependencies": { "devDependencies": {
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0", "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0",
"web-component-tester": "*", "web-component-tester": "polymer/web-component-tester#^3.4.0",
"test-fixture": "PolymerElements/test-fixture#^1.0.0", "test-fixture": "PolymerElements/test-fixture#^1.0.0",
"iron-component-page": "PolymerElements/iron-component-page#^1.0.0", "iron-component-page": "PolymerElements/iron-component-page#^1.0.0",
"iron-demo-helpers": "PolymerElements/iron-demo-helpers#^1.0.0",
"iron-flex-layout": "PolymerElements/iron-flex-layout#^1.0.0", "iron-flex-layout": "PolymerElements/iron-flex-layout#^1.0.0",
"iron-test-helpers": "PolymerElements/iron-test-helpers#^1.0.0" "iron-test-helpers": "PolymerElements/iron-test-helpers#^1.0.0"
}, },

View file

@ -17,86 +17,66 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
<meta name="apple-mobile-web-app-capable" content="yes"> <meta name="apple-mobile-web-app-capable" content="yes">
<script src="../../webcomponentsjs/webcomponents-lite.js"></script> <script src="../../webcomponentsjs/webcomponents-lite.js"></script>
<link rel="import" href="../../paper-styles/demo-pages.html"> <link rel="import" href="../../iron-demo-helpers/demo-snippet.html">
<link rel="import" href="../../iron-demo-helpers/demo-pages-shared-styles.html">
<link rel="import" href="../paper-checkbox.html"> <link rel="import" href="../paper-checkbox.html">
<style is="custom-style"> <style is="custom-style" include="demo-pages-shared-styles">
paper-checkbox { paper-checkbox {
display: block; display: block;
margin-right: 24px;
}
demo-snippet {
margin-bottom: 40px; margin-bottom: 40px;
} }
.vertical-section-container {
paper-checkbox.blue { max-width: 550px;
--paper-checkbox-checked-color: var(--paper-light-blue-500);
--paper-checkbox-checked-ink-color: var(--paper-light-blue-500);
--paper-checkbox-unchecked-color: var(--paper-light-blue-900);
--paper-checkbox-unchecked-ink-color: var(--paper-light-blue-900);
} }
</style>
</head>
<body unresolved>
<div class="vertical-section-container centered">
<h3>Checkboxes can be checked or unchecked, or disabled entirely</h3>
<demo-snippet class="centered-demo">
<template>
<paper-checkbox>Checkbox</paper-checkbox>
<paper-checkbox checked>Checkbox</paper-checkbox>
<paper-checkbox disabled>Disabled</paper-checkbox>
</template>
</demo-snippet>
<h3>Checkboxes can hide the ripple effect using the <i>noink</i> attribute</h3>
<demo-snippet class="centered-demo">
<template>
<paper-checkbox noink>Checkbox</paper-checkbox>
</template>
</demo-snippet>
<h3>Checkboxes can be styled using custom properties</h3>
<demo-snippet class="centered-demo small-text">
<template>
<style is="custom-style">
paper-checkbox.red { paper-checkbox.red {
--paper-checkbox-checked-color: var(--paper-red-500); --paper-checkbox-checked-color: var(--paper-red-500);
--paper-checkbox-checked-ink-color: var(--paper-red-500); --paper-checkbox-checked-ink-color: var(--paper-red-500);
--paper-checkbox-unchecked-color: var(--paper-red-900); --paper-checkbox-unchecked-color: var(--paper-red-900);
--paper-checkbox-unchecked-ink-color: var(--paper-red-900); --paper-checkbox-unchecked-ink-color: var(--paper-red-900);
--paper-checkbox-label-color: var(--paper-red-500);
} }
paper-checkbox.green { paper-checkbox.green {
--paper-checkbox-checked-color: var(--paper-green-500); --paper-checkbox-checked-color: var(--paper-green-500);
--paper-checkbox-checked-ink-color: var(--paper-green-500); --paper-checkbox-checked-ink-color: var(--paper-green-500);
--paper-checkbox-unchecked-color: var(--paper-green-900); --paper-checkbox-unchecked-color: var(--paper-green-900);
--paper-checkbox-unchecked-ink-color: var(--paper-green-900); --paper-checkbox-unchecked-ink-color: var(--paper-green-900);
} --paper-checkbox-label-color: var(--paper-green-500);
paper-checkbox.orange {
--paper-checkbox-checked-color: var(--paper-orange-500);
--paper-checkbox-checked-ink-color: var(--paper-orange-500);
--paper-checkbox-unchecked-color: var(--paper-orange-900);
--paper-checkbox-unchecked-ink-color: var(--paper-orange-900);
} }
</style> </style>
</head>
<body unresolved> <paper-checkbox class="red">Checkbox</paper-checkbox>
<div class="horizontal-section-container"> <paper-checkbox checked class="green">Checkbox</paper-checkbox>
<div> </template>
<h4>Enabled</h4> </demo-snippet>
<div class="horizontal-section">
<paper-checkbox>Oxygen</paper-checkbox>
<paper-checkbox>Carbon</paper-checkbox>
<paper-checkbox checked>Hydrogen</paper-checkbox>
<paper-checkbox checked>Nitrogen</paper-checkbox>
<paper-checkbox checked>Calcium</paper-checkbox>
</div>
</div>
<div>
<h4>Disabled</h4>
<div class="horizontal-section">
<paper-checkbox disabled>Oxygen</paper-checkbox>
<paper-checkbox disabled>Carbon</paper-checkbox>
<paper-checkbox checked disabled>Hydrogen</paper-checkbox>
<paper-checkbox checked disabled>Nitrogen</paper-checkbox>
<paper-checkbox checked disabled>Calcium</paper-checkbox>
</div>
</div>
<div>
<h4>Color</h4>
<div class="horizontal-section">
<paper-checkbox class="blue" checked aria-label="Hurray for oxygen">Oxygen</paper-checkbox>
<paper-checkbox class="red" checked>Carbon</paper-checkbox>
<paper-checkbox class="orange" checked>Hydrogen</paper-checkbox>
<paper-checkbox class="green" checked>Nitrogen</paper-checkbox>
<paper-checkbox class="blue" checked>Calcium</paper-checkbox>
</div>
</div>
<div>
<h4>Noink</h4>
<div class="horizontal-section">
<paper-checkbox noink>Oxygen</paper-checkbox>
<paper-checkbox noink>Carbon</paper-checkbox>
<paper-checkbox checked noink>Hydrogen</paper-checkbox>
<paper-checkbox checked noink>Nitrogen</paper-checkbox>
<paper-checkbox checked noink>Calcium</paper-checkbox>
</div>
</div>
</div> </div>
</body> </body>
</html> </html>

View file

@ -15,12 +15,9 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
<script src="../../webcomponentsjs/webcomponents-lite.js"></script> <script src="../../webcomponentsjs/webcomponents-lite.js"></script>
<script src="../../web-component-tester/browser.js"></script> <script src="../../web-component-tester/browser.js"></script>
<script src="../../test-fixture/test-fixture-mocha.js"></script>
<script src="../../iron-test-helpers/mock-interactions.js"></script> <script src="../../iron-test-helpers/mock-interactions.js"></script>
<link rel="import" href="../../test-fixture/test-fixture.html">
<link rel="import" href="../paper-checkbox.html"> <link rel="import" href="../paper-checkbox.html">
</head> </head>
<body> <body>

View file

@ -1,14 +1,11 @@
<!doctype html> <!DOCTYPE html><!--
<!--
Copyright (c) 2015 The Polymer Project Authors. All rights reserved. Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
Code distributed by Google as part of the polymer project is also Code distributed by Google as part of the polymer project is also
subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
--> --><html><head>
<html>
<head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1.0, user-scalable=yes"> <meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1.0, user-scalable=yes">
<title>paper-checkbox tests</title> <title>paper-checkbox tests</title>
@ -17,8 +14,10 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
<body> <body>
<script> <script>
WCT.loadSuites([ WCT.loadSuites([
'basic.html' 'basic.html',
'basic.html?dom=shadow'
]); ]);
</script> </script>
</body>
</html>
</body></html>

View file

@ -110,7 +110,7 @@
function isUnlockedOverride(feature) { function isUnlockedOverride(feature) {
if (feature == 'playback' || feature == 'livetv') { if (feature == 'playback') {
return isPlaybackUnlockedViaOldApp(); return isPlaybackUnlockedViaOldApp();
} else { } else {
return new Promise(function (resolve, reject) { return new Promise(function (resolve, reject) {

View file

@ -6,7 +6,7 @@
self.upload = function (path, name, url) { self.upload = function (path, name, url) {
var deferred = DeferredBuilder.Deferred(); return new Promise(function (resolve, reject) {
resolveLocalFileSystemURL(path, function (fileEntry) { resolveLocalFileSystemURL(path, function (fileEntry) {
@ -16,7 +16,7 @@
if (mimeType.indexOf('image/') != 0) { if (mimeType.indexOf('image/') != 0) {
Logger.log('Skipping upload because file is not an image. path: ' + path + ' mimeType: ' + mimeType); Logger.log('Skipping upload because file is not an image. path: ' + path + ' mimeType: ' + mimeType);
deferred.reject(); reject();
return; return;
} }
@ -26,13 +26,13 @@
console.log("Code = " + r.responseCode); console.log("Code = " + r.responseCode);
console.log("Response = " + r.response); console.log("Response = " + r.response);
console.log("Sent = " + r.bytesSent); console.log("Sent = " + r.bytesSent);
deferred.resolve(); resolve();
} }
var onFail = function (error) { var onFail = function (error) {
console.log("upload error source " + error.source); console.log("upload error source " + error.source);
console.log("upload error target " + error.target); console.log("upload error target " + error.target);
deferred.reject(); reject();
} }
var options = new FileUploadOptions(); var options = new FileUploadOptions();
@ -47,16 +47,15 @@
}, function () { }, function () {
Logger.log('File upload failed. fileEntry.file returned an error'); Logger.log('File upload failed. fileEntry.file returned an error');
deferred.reject(); reject();
}); });
}, function () { }, function () {
Logger.log('File upload failed. resolveLocalFileSystemURL returned an error'); Logger.log('File upload failed. resolveLocalFileSystemURL returned an error');
deferred.reject(); reject();
});
}); });
return deferred.promise();
}; };
} }

View file

@ -250,7 +250,8 @@
} }
function getSubscriptionOptions() { function getSubscriptionOptions() {
var deferred = DeferredBuilder.Deferred();
return new Promise(function (resolve, reject) {
var options = []; var options = [];
@ -270,15 +271,16 @@
return o; return o;
}); });
deferred.resolveWith(null, [options]); resolve(options);
return deferred.promise(); });
} }
function isUnlockedOverride(feature) { function isUnlockedOverride(feature) {
var deferred = DeferredBuilder.Deferred(); return new Promise(function (resolve, reject) {
deferred.resolveWith(null, [false]);
return deferred.promise(); resolve(false);
});
} }
window.IapManager = { window.IapManager = {

View file

@ -586,20 +586,16 @@
self.init = function () { self.init = function () {
var deferred = DeferredBuilder.Deferred(); return new Promise(function (resolve, reject) {
if (options.type == 'video' && enableHlsPlayer()) { if (options.type == 'video' && enableHlsPlayer()) {
requireHlsPlayer(function () { requireHlsPlayer(resolve);
deferred.resolve();
});
} else { } else {
deferred.resolve(); resolve();
} }
});
return deferred.promise();
}; };
if (options.type == 'audio') { if (options.type == 'audio') {

View file

@ -851,6 +851,7 @@
function disableEvent(e) { function disableEvent(e) {
e.preventDefault(); e.preventDefault();
e.stopPropagation();
return false; return false;
} }
@ -879,6 +880,8 @@
chkItemSelect.checked = !chkItemSelect.checked; chkItemSelect.checked = !chkItemSelect.checked;
} }
} }
e.preventDefault();
return false;
} }
} }
@ -896,6 +899,7 @@
} }
e.preventDefault(); e.preventDefault();
e.stopPropagation();
return false; return false;
} }

View file

@ -6,7 +6,7 @@
self.show = function () { self.show = function () {
require(['css!css/search.css']); require(['css!css/search.css'], function() {
$('.headerSearchInput').val(''); $('.headerSearchInput').val('');
$('.btnCloseSearch').hide(); $('.btnCloseSearch').hide();
@ -16,6 +16,7 @@
$('.headerSearchInput').focus(); $('.headerSearchInput').focus();
$('.btnCloseSearch').show(); $('.btnCloseSearch').show();
}; };
});
}; };
function fadeIn(elem, iterations) { function fadeIn(elem, iterations) {

View file

@ -23,6 +23,7 @@
var thresholdX = Math.max(screen.availWidth); var thresholdX = Math.max(screen.availWidth);
var thresholdY = Math.max(screen.availHeight); var thresholdY = Math.max(screen.availHeight);
var wheelEvent = (document.implementation.hasFeature('Event.wheel', '3.0') ? 'wheel' : 'mousewheel');
function visibleInViewport(elem, partial) { function visibleInViewport(elem, partial) {
@ -58,7 +59,7 @@
} }
} }
function unveilElements(elems, parent) { function unveilElements(elems) {
if (!elems.length) { if (!elems.length) {
return; return;
@ -68,14 +69,6 @@
unveilId++; unveilId++;
var parents = [];
if (parent) {
parents = parent.querySelectorAll('.itemsContainer');
if (!parents.length) {
parents = [parent];
}
}
function unveil() { function unveil() {
var remaining = []; var remaining = [];
@ -93,17 +86,14 @@
if (!images.length) { if (!images.length) {
document.removeEventListener('scroll', unveil); document.removeEventListener('scroll', unveil);
document.removeEventListener(wheelEvent, unveil);
window.removeEventListener('resize', unveil); window.removeEventListener('resize', unveil);
bindEvent(parents, 'removeEventListener', 'scroll', unveil);
} }
} }
document.addEventListener('scroll', unveil); document.addEventListener('scroll', unveil, true);
window.addEventListener('resize', unveil); document.addEventListener(wheelEvent, unveil, true);
window.addEventListener('resize', unveil, true);
if (parents.length) {
bindEvent(parents, 'addEventListener', 'scroll', unveil);
}
unveil(); unveil();
} }