1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00

update components

This commit is contained in:
Luke Pulverenti 2015-12-18 12:31:11 -05:00
parent e0322a7fe8
commit f7a0bd8486
39 changed files with 290 additions and 262 deletions

View file

@ -16,12 +16,12 @@
}, },
"devDependencies": {}, "devDependencies": {},
"ignore": [], "ignore": [],
"version": "1.0.15", "version": "1.0.16",
"_release": "1.0.15", "_release": "1.0.16",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "1.0.15", "tag": "1.0.16",
"commit": "2b89c4815135e6acef56ec14d56ad0a1d7551e00" "commit": "a454b78f6e617aef9359736c57f38ac40fcc8d61"
}, },
"_source": "git://github.com/MediaBrowser/Emby.ApiClient.Javascript.git", "_source": "git://github.com/MediaBrowser/Emby.ApiClient.Javascript.git",
"_target": "~1.0.3", "_target": "~1.0.3",

View file

@ -434,13 +434,13 @@
function afterConnected(apiClient, options) { function afterConnected(apiClient, options) {
options = options || {}; options = options || {};
if (options.reportCapabilities !== false) { if (options.reportCapabilities !== false) {
apiClient.reportCapabilities(capabilities); apiClient.reportCapabilities(capabilities);
} }
if (options.enableWebSocket !== false) { if (options.enableWebSocket !== false) {
if (!apiClient.isWebSocketOpenOrConnecting && apiClient.isWebSocketSupported()) { if (!apiClient.isWebSocketOpenOrConnecting() && apiClient.isWebSocketSupported()) {
console.log('calling apiClient.openWebSocket'); console.log('calling apiClient.openWebSocket');
apiClient.openWebSocket(); apiClient.openWebSocket();

View file

@ -1,6 +1,6 @@
{ {
"name": "hls.js", "name": "hls.js",
"version": "0.3.11", "version": "0.3.13",
"description": "Media Source Extension - HLS library, by/for Dailymotion", "description": "Media Source Extension - HLS library, by/for Dailymotion",
"homepage": "https://github.com/dailymotion/hls.js", "homepage": "https://github.com/dailymotion/hls.js",
"authors": [ "authors": [
@ -15,14 +15,13 @@
"test", "test",
"tests" "tests"
], ],
"_release": "0.3.11", "_release": "0.3.13",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v0.3.11", "tag": "v0.3.13",
"commit": "4e698e4adc4e1e0fa80ef9c8334a5ef382bbe347" "commit": "a7aa29605b6814b2f99c1e07db0fcb5bf9cd890a"
}, },
"_source": "git://github.com/dailymotion/hls.js.git", "_source": "git://github.com/dailymotion/hls.js.git",
"_target": "~0.3.11", "_target": "~0.3.11",
"_originalSource": "dailymotion/hls.js", "_originalSource": "dailymotion/hls.js"
"_direct": true
} }

View file

@ -1,6 +1,6 @@
{ {
"name": "hls.js", "name": "hls.js",
"version": "0.3.11", "version": "0.3.13",
"description": "Media Source Extension - HLS library, by/for Dailymotion", "description": "Media Source Extension - HLS library, by/for Dailymotion",
"homepage": "https://github.com/dailymotion/hls.js", "homepage": "https://github.com/dailymotion/hls.js",
"authors": [ "authors": [

View file

@ -72,8 +72,9 @@ header {
<div id="customButtons"></div> <div id="customButtons"></div>
<select id="streamSelect" class="innerControls"><option value="" selected>(Enter custom URL below)</option></select> <select id="streamSelect" class="innerControls"><option value="" selected>(Enter custom URL below)</option></select>
<input id="streamURL" class="innerControls" type=text value=""/> <input id="streamURL" class="innerControls" type=text value=""/>
<label class="innerControls"><input id="enableStream" type=checkbox checked/> Enable Streaming</label> <label class="innerControls"><input id="enableStreaming" type=checkbox checked/> Enable Streaming</label>
<label class="innerControls"><input id="autoRecoverError" type=checkbox checked/> Auto-Recover Media Error</label> <label class="innerControls"><input id="autoRecoverError" type=checkbox checked/> Auto-Recover Media Error</label>
<label class="innerControls"><input id="enableWorker" type=checkbox checked/> Enable Worker</label>
<div id="StreamPermalink" class="innerControls"></div> <div id="StreamPermalink" class="innerControls"></div>
<div> <div>
<select id="videoSize" style="float:left"> <select id="videoSize" style="float:left">
@ -201,21 +202,25 @@ $(document).ready(function() {
$("#StatsDisplay").hide(); $("#StatsDisplay").hide();
$('#metricsButtonWindow').toggle(windowSliding); $('#metricsButtonWindow').toggle(windowSliding);
$('#metricsButtonFixed').toggle(!windowSliding); $('#metricsButtonFixed').toggle(!windowSliding);
$('#enableStream').click(function() { enableStreaming = this.checked; loadStream($('#streamURL').val());}); $('#enableStreaming').click(function() { enableStreaming = this.checked; loadStream($('#streamURL').val()); });
$('#autoRecoverError').prop( "checked", true ); $('#autoRecoverError').click(function() { autoRecoverError = this.checked; updatePermalink();});
$('#autoRecoverError').click(function() { autoRecoverError = this.checked; }); $('#enableWorker').click(function() { enableWorker = this.checked; updatePermalink();});
$('#enableStreaming').prop( "checked", enableStreaming );
$('#autoRecoverError').prop( "checked", autoRecoverError );
$('#enableWorker').prop( "checked", enableWorker );
}); });
'use strict'; 'use strict';
var hls,events, stats, enableStreaming = true, autoRecoverError = true; var hls,events, stats,
enableStreaming = JSON.parse(getURLParam('enableStreaming',true))
autoRecoverError = JSON.parse(getURLParam('autoRecoverError',true)),
enableWorker = JSON.parse(getURLParam('enableWorker',true));
var video = $('#video')[0]; var video = $('#video')[0];
video.volume = 0.05; video.volume = 0.05;
var manifest = decodeURIComponent(location.search.split('src=')[1]); loadStream(decodeURIComponent(getURLParam('src','http://www.streambox.fr/playlists/x36xhzz/x36xhzz.m3u8')));
if(manifest === 'undefined') {
manifest = 'http://www.streambox.fr/playlists/x36xhzz/x36xhzz.m3u8';
}
loadStream(manifest);
function loadStream(url) { function loadStream(url) {
hideCanvas(); hideCanvas();
@ -230,10 +235,7 @@ $(document).ready(function() {
} }
$('#streamURL').val(url); $('#streamURL').val(url);
var hlsLink = document.URL.split('?')[0] + '?src=' + encodeURIComponent(url); updatePermalink();
var description = 'permalink: ' + "<a href=\"" + hlsLink + "\">" + hlsLink + "</a>";
$("#StreamPermalink").html(description);
if(!enableStreaming) { if(!enableStreaming) {
$("#HlsStatus").text("Streaming disabled"); $("#HlsStatus").text("Streaming disabled");
return; return;
@ -242,7 +244,7 @@ $(document).ready(function() {
$("#HlsStatus").text('loading ' + url); $("#HlsStatus").text('loading ' + url);
events = { url : url, t0 : performance.now(), load : [], buffer : [], video : [], level : [], bitrate : []}; events = { url : url, t0 : performance.now(), load : [], buffer : [], video : [], level : [], bitrate : []};
recoverDecodingErrorDate = recoverSwapAudioCodecDate = null; recoverDecodingErrorDate = recoverSwapAudioCodecDate = null;
hls = new Hls({debug:true}); hls = new Hls({debug:true, enableWorker : enableWorker});
$("#HlsStatus").text('loading manifest and attaching video element...'); $("#HlsStatus").text('loading manifest and attaching video element...');
hls.loadSource(url); hls.loadSource(url);
hls.attachMedia(video); hls.attachMedia(video);
@ -908,6 +910,25 @@ function timeRangesToString(r) {
} }
} }
function getURLParam(sParam, defaultValue) {
var sPageURL = window.location.search.substring(1);
var sURLVariables = sPageURL.split('&');
for (var i = 0; i < sURLVariables.length; i++) {
var sParameterName = sURLVariables[i].split('=');
if (sParameterName[0] == sParam) {
return sParameterName[1];
}
}
return defaultValue;
}
function updatePermalink() {
var url = $('#streamURL').val();
var hlsLink = document.URL.split('?')[0] + '?src=' + encodeURIComponent(url) + '&enableStreaming=' + enableStreaming + '&autoRecoverError=' + autoRecoverError + '&enableWorker=' + enableWorker;
var description = 'permalink: ' + "<a href=\"" + hlsLink + "\">" + hlsLink + "</a>";
$("#StreamPermalink").html(description);
}
</script> </script>
</body> </body>

View file

@ -565,14 +565,14 @@ var LevelController = (function () {
} }
// only keep level with supported audio/video codecs // only keep level with supported audio/video codecs
levels0 = levels0.filter(function (level) { levels = levels.filter(function (level) {
var checkSupported = function checkSupported(codec) { var checkSupported = function checkSupported(codec) {
return MediaSource.isTypeSupported('video/mp4;codecs=' + codec); return MediaSource.isTypeSupported('video/mp4;codecs=' + codec);
}; };
var audioCodec = level.audioCodec, var audioCodec = level.audioCodec,
videoCodec = level.videoCodec; videoCodec = level.videoCodec;
return (audioCodec && checkSupported(audioCodec) || !audioCodec) && (videoCodec && checkSupported(videoCodec) || !videoCodec); return (!audioCodec || checkSupported(audioCodec)) && (!videoCodec || checkSupported(videoCodec));
}); });
// start bitrate is the first bitrate of the manifest // start bitrate is the first bitrate of the manifest
@ -2691,7 +2691,7 @@ var AACDemuxer = (function () {
break; break;
} }
} }
this.remuxer.remux(this._aacTrack, { samples: [] }, { samples: [] }, timeOffset); this.remuxer.remux(this._aacTrack, { samples: [] }, { samples: [{ pts: pts, dts: pts, unit: id3.payload }] }, timeOffset);
} }
}, { }, {
key: '_ADTStoAudioConfig', key: '_ADTStoAudioConfig',
@ -3570,6 +3570,7 @@ var ID3 = (function () {
_utilsLogger.logger.warn('ID3 tag found, but no timestamp'); _utilsLogger.logger.warn('ID3 tag found, but no timestamp');
} }
this._length = len; this._length = len;
this._payload = data.subarray(0, len);
} }
return; return;
} }
@ -3646,6 +3647,11 @@ var ID3 = (function () {
get: function get() { get: function get() {
return this._length; return this._length;
} }
}, {
key: 'payload',
get: function get() {
return this._payload;
}
}]); }]);
return ID3; return ID3;
@ -5301,7 +5307,7 @@ var PlaylistLoader = (function () {
if (avcdata.length > 2) { if (avcdata.length > 2) {
result = avcdata.shift() + '.'; result = avcdata.shift() + '.';
result += parseInt(avcdata.shift()).toString(16); result += parseInt(avcdata.shift()).toString(16);
result += ('00' + parseInt(avcdata.shift()).toString(16)).substr(-4); result += ('000' + parseInt(avcdata.shift()).toString(16)).substr(-4);
} else { } else {
result = codec; result = codec;
} }

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -1,6 +1,6 @@
{ {
"name": "hls.js", "name": "hls.js",
"version": "0.3.11", "version": "0.3.13",
"description": "Media Source Extension - HLS library, by/for Dailymotion", "description": "Media Source Extension - HLS library, by/for Dailymotion",
"homepage": "https://github.com/dailymotion/hls.js", "homepage": "https://github.com/dailymotion/hls.js",
"authors": "Guillaume du Pontavice <guillaume.dupontavice@dailymotion.com>", "authors": "Guillaume du Pontavice <guillaume.dupontavice@dailymotion.com>",

View file

@ -65,13 +65,12 @@ class LevelController {
} }
// only keep level with supported audio/video codecs // only keep level with supported audio/video codecs
levels0 = levels0.filter(function(level) { levels = levels.filter(function(level) {
var checkSupported = function(codec) { return MediaSource.isTypeSupported(`video/mp4;codecs=${codec}`);}; var checkSupported = function(codec) { return MediaSource.isTypeSupported(`video/mp4;codecs=${codec}`);};
var audioCodec = level.audioCodec, videoCodec = level.videoCodec; var audioCodec = level.audioCodec, videoCodec = level.videoCodec;
return ((audioCodec && checkSupported(audioCodec)) || !audioCodec) && return (!audioCodec || checkSupported(audioCodec)) &&
((videoCodec && checkSupported(videoCodec)) || !videoCodec); (!videoCodec || checkSupported(videoCodec));
}); });
// start bitrate is the first bitrate of the manifest // start bitrate is the first bitrate of the manifest

View file

@ -79,7 +79,7 @@ import {ErrorTypes, ErrorDetails} from '../errors';
break; break;
} }
} }
this.remuxer.remux(this._aacTrack,{samples : []}, {samples : []}, timeOffset); this.remuxer.remux(this._aacTrack,{samples : []}, {samples : [ { pts: pts, dts : pts, unit : id3.payload} ]}, timeOffset);
} }
_ADTStoAudioConfig(data, offset, audioCodec) { _ADTStoAudioConfig(data, offset, audioCodec) {

View file

@ -41,6 +41,7 @@ import {logger} from '../utils/logger';
logger.warn('ID3 tag found, but no timestamp'); logger.warn('ID3 tag found, but no timestamp');
} }
this._length = len; this._length = len;
this._payload = data.subarray(0,len);
} }
return; return;
} }
@ -117,6 +118,10 @@ import {logger} from '../utils/logger';
return this._length; return this._length;
} }
get payload() {
return this._payload;
}
} }
export default ID3; export default ID3;

View file

@ -94,7 +94,7 @@ class PlaylistLoader {
if (avcdata.length > 2) { if (avcdata.length > 2) {
result = avcdata.shift() + '.'; result = avcdata.shift() + '.';
result += parseInt(avcdata.shift()).toString(16); result += parseInt(avcdata.shift()).toString(16);
result += ('00' + parseInt(avcdata.shift()).toString(16)).substr(-4); result += ('000' + parseInt(avcdata.shift()).toString(16)).substr(-4);
} else { } else {
result = codec; result = codec;
} }

View file

@ -1,6 +1,6 @@
{ {
"name": "iron-checked-element-behavior", "name": "iron-checked-element-behavior",
"version": "1.0.3", "version": "1.0.4",
"description": "Implements an element that has a checked attribute and can be added to a form", "description": "Implements an element that has a checked attribute and can be added to a form",
"authors": "The Polymer Authors", "authors": "The Polymer Authors",
"keywords": [ "keywords": [
@ -31,11 +31,11 @@
"web-component-tester": "*", "web-component-tester": "*",
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
}, },
"_release": "1.0.3", "_release": "1.0.4",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.0.3", "tag": "v1.0.4",
"commit": "5a0520d20eb8883076ce64117f2726ba209ebc97" "commit": "cc30263ec2871ae8f8f944948f44299d3f3cdf0d"
}, },
"_source": "git://github.com/PolymerElements/iron-checked-element-behavior.git", "_source": "git://github.com/PolymerElements/iron-checked-element-behavior.git",
"_target": "^1.0.0", "_target": "^1.0.0",

View file

@ -1,9 +1,15 @@
language: node_js language: node_js
sudo: false sudo: false
matrix: before_script:
include: - npm install web-component-tester
- node_js: stable - npm install bower
script: xvfb-run wct - 'export PATH=$PWD/node_modules/.bin:$PATH'
- bower install
env:
global:
- secure: EJSBYkW/C3ppDTbxHYRzyFPAko5R1ET1LSbdM484/j0OHGLkSIwtKrrZLNz5+QEmKSw79MpLpBoD+SfXuSCn0yKkf6tvK4mt+kRs32vKVfoWrYReVcfth+EWV7QDpTDJw1QEijT1bKUxULhP0OrT2/5vVpKpXX2zczg+VFL7IZuY3y1dsA4qWmWTfMiAk3762dZx47D5qzJ4POHlpG0i/cHH2EgqV8sFXFBctf6EY68GqzStPUuMuea6xX2wMrebg6vqQDfDb1gs8N34gxGE+u8QaqOSniW1Vzdoe1vwOUo4dbJYw3JMYK5Qn2pj3p2E4m9J609JNnBfqjS7mB5KVC7Hf5r9ul3UMsAIlOnlmSqOq1oO22/3regjWHGjlrzCNHzma2SgDhTxGaLDJl1LnsUevbVb6TGloiQPXwum8oa7dvZ1PqspqyqZEb31t/FyUnG+VXnC0YYpdRj3eRGqeoqqaNtad97DrPHP7er9LdvJIKjsXux7gUW4hKWsr+jsU/krdHpTUC8GYWdTF54EcLhxfzNYKL7voTq+xoQ2yxCOSiBmcQCviuQyVvNQyhde/+edAmOt24CLiuSQjHCbEWzBQs9QinUPRekg6+LJ1WaifTIKkhsm04AdaZrs7LR34hF+Mpqp4HHl/AfcbtVeB/W7jUnhJyMFaQDfGkpzSZs=
- secure: izhN5Z3WdajR3ois2T55qepsvLwVg/wv8u4kVQ4TqWhUL08tka83m/W+EMzS/tcvfz7J3VkuTFrJ5scYD9kaTVhRo4dv2u+DdbPmTNcf/hmADXLVLxddyueK3bWEcBurg8+rSdqq/RdI+5CPwWeGtQl+lmjRCyBzodIpQ90zJQF4Al7nmmLuEUhiNVjuqQ3VB1pFLYgky4SVM0bfJnoKSDsZ2z9DOOJE34ZUUmcNqVcQoZ5/oM+PWdVDkUqW3vMK1lTMtE/dk6WcSztQwFyoMrW+uzEstPwUsJCyuBEx4KdioXZH3vrlxRApySfHmEf5eVWwE6jyPSHuWj/2D5O4R9LY1dq1Wcoiu3BJj19B4V3s4L2uJF+xL077d4Mna6z9dE4RSRzs8Z8MvSMTgzDkga/A25JI3XxJMJ78WTbkNQ4hVFN2xwcU5cm+fbs3Sr1ZEdFW/MWAPtUQOzscqS5Op7sSLLaiqO+R0zj56H2NA2bl/zCmbZhyLcOPl0oAfJ85bqNxyF8CoO+GZ98UG15ROigC90/HCP7TUHZnQSrGtiFGTiPTBm+VCITYmC5IEyJBTwgqh/ljbDzz4UuSZ3KsldL3MwWnqO3tGr6VvPfqKF6xq0vuyn9P7f9WNAYwZGcRi3AtxtY+znO+IGv2sGmrfo7ZY+U4nceXTEDrG8OY0Jo=
node_js: 4
addons: addons:
firefox: latest firefox: latest
apt: apt:
@ -11,18 +17,6 @@ matrix:
- google-chrome - google-chrome
packages: packages:
- google-chrome-stable - google-chrome-stable
- node_js: node
script: script:
- | - xvfb-run wct
if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then - "if [ \"${TRAVIS_PULL_REQUEST}\" = \"false\" ]; then wct -s 'default'; fi"
wct -s 'default'
fi
before_script:
- npm install web-component-tester
- npm install bower
- export PATH=$PWD/node_modules/.bin:$PATH
- bower install
env:
global:
- secure: EJSBYkW/C3ppDTbxHYRzyFPAko5R1ET1LSbdM484/j0OHGLkSIwtKrrZLNz5+QEmKSw79MpLpBoD+SfXuSCn0yKkf6tvK4mt+kRs32vKVfoWrYReVcfth+EWV7QDpTDJw1QEijT1bKUxULhP0OrT2/5vVpKpXX2zczg+VFL7IZuY3y1dsA4qWmWTfMiAk3762dZx47D5qzJ4POHlpG0i/cHH2EgqV8sFXFBctf6EY68GqzStPUuMuea6xX2wMrebg6vqQDfDb1gs8N34gxGE+u8QaqOSniW1Vzdoe1vwOUo4dbJYw3JMYK5Qn2pj3p2E4m9J609JNnBfqjS7mB5KVC7Hf5r9ul3UMsAIlOnlmSqOq1oO22/3regjWHGjlrzCNHzma2SgDhTxGaLDJl1LnsUevbVb6TGloiQPXwum8oa7dvZ1PqspqyqZEb31t/FyUnG+VXnC0YYpdRj3eRGqeoqqaNtad97DrPHP7er9LdvJIKjsXux7gUW4hKWsr+jsU/krdHpTUC8GYWdTF54EcLhxfzNYKL7voTq+xoQ2yxCOSiBmcQCviuQyVvNQyhde/+edAmOt24CLiuSQjHCbEWzBQs9QinUPRekg6+LJ1WaifTIKkhsm04AdaZrs7LR34hF+Mpqp4HHl/AfcbtVeB/W7jUnhJyMFaQDfGkpzSZs=
- secure: izhN5Z3WdajR3ois2T55qepsvLwVg/wv8u4kVQ4TqWhUL08tka83m/W+EMzS/tcvfz7J3VkuTFrJ5scYD9kaTVhRo4dv2u+DdbPmTNcf/hmADXLVLxddyueK3bWEcBurg8+rSdqq/RdI+5CPwWeGtQl+lmjRCyBzodIpQ90zJQF4Al7nmmLuEUhiNVjuqQ3VB1pFLYgky4SVM0bfJnoKSDsZ2z9DOOJE34ZUUmcNqVcQoZ5/oM+PWdVDkUqW3vMK1lTMtE/dk6WcSztQwFyoMrW+uzEstPwUsJCyuBEx4KdioXZH3vrlxRApySfHmEf5eVWwE6jyPSHuWj/2D5O4R9LY1dq1Wcoiu3BJj19B4V3s4L2uJF+xL077d4Mna6z9dE4RSRzs8Z8MvSMTgzDkga/A25JI3XxJMJ78WTbkNQ4hVFN2xwcU5cm+fbs3Sr1ZEdFW/MWAPtUQOzscqS5Op7sSLLaiqO+R0zj56H2NA2bl/zCmbZhyLcOPl0oAfJ85bqNxyF8CoO+GZ98UG15ROigC90/HCP7TUHZnQSrGtiFGTiPTBm+VCITYmC5IEyJBTwgqh/ljbDzz4UuSZ3KsldL3MwWnqO3tGr6VvPfqKF6xq0vuyn9P7f9WNAYwZGcRi3AtxtY+znO+IGv2sGmrfo7ZY+U4nceXTEDrG8OY0Jo=

View file

@ -1,6 +1,6 @@
{ {
"name": "iron-checked-element-behavior", "name": "iron-checked-element-behavior",
"version": "1.0.3", "version": "1.0.4",
"description": "Implements an element that has a checked attribute and can be added to a form", "description": "Implements an element that has a checked attribute and can be added to a form",
"authors": "The Polymer Authors", "authors": "The Polymer Authors",
"keywords": [ "keywords": [

View file

@ -74,6 +74,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
/** /**
* Returns false if the element is required and not checked, and true otherwise. * Returns false if the element is required and not checked, and true otherwise.
* @param {*=} _value Ignored.
* @return {boolean} true if `required` is false, or if `required` and `checked` are both true. * @return {boolean} true if `required` is false, or if `required` and `checked` are both true.
*/ */
_getValidity: function(_value) { _getValidity: function(_value) {

View file

@ -1,5 +1,4 @@
<!doctype html> <!DOCTYPE html><!--
<!--
@license @license
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
@ -7,9 +6,7 @@ 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>
<title>iron-checked-element-behavior tests</title> <title>iron-checked-element-behavior tests</title>
@ -23,12 +20,12 @@ 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

@ -1,6 +1,6 @@
{ {
"name": "iron-icons", "name": "iron-icons",
"version": "1.0.5", "version": "1.0.6",
"description": "A set of icons for use with iron-icon", "description": "A set of icons for use with iron-icon",
"authors": [ "authors": [
"The Polymer Authors" "The Polymer Authors"
@ -34,11 +34,11 @@
"util", "util",
"update-icons.sh" "update-icons.sh"
], ],
"_release": "1.0.5", "_release": "1.0.6",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.0.5", "tag": "v1.0.6",
"commit": "39da54afbc17af343d1f95e62c5c0c477492677a" "commit": "bea6cd482cb127b08f9fbcb2b74aa7bbc8604076"
}, },
"_source": "git://github.com/PolymerElements/iron-icons.git", "_source": "git://github.com/PolymerElements/iron-icons.git",
"_target": "^1.0.0", "_target": "^1.0.0",

View file

@ -11,7 +11,7 @@ env:
- secure: LBT0VumsEPWUYm0OLhqHU1XWmVY18QP64cMeqZAwASnYYyH/R5OGYAcI7aH8To29FWpkZSL85NPto37bN+f8DWRSULq4p+1wl2HviYHsam8x1NzN7hKq6nv+203qaT9SflheaNy6sSDfZJQ+36bRcGQ5khKkVeDpw7h8D/osSQ4= - secure: LBT0VumsEPWUYm0OLhqHU1XWmVY18QP64cMeqZAwASnYYyH/R5OGYAcI7aH8To29FWpkZSL85NPto37bN+f8DWRSULq4p+1wl2HviYHsam8x1NzN7hKq6nv+203qaT9SflheaNy6sSDfZJQ+36bRcGQ5khKkVeDpw7h8D/osSQ4=
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": "iron-icons", "name": "iron-icons",
"version": "1.0.5", "version": "1.0.6",
"description": "A set of icons for use with iron-icon", "description": "A set of icons for use with iron-icon",
"authors": [ "authors": [
"The Polymer Authors" "The Polymer Authors"

View file

@ -63,7 +63,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
} }
.set:nth-of-type(4n-2) { .set:nth-of-type(4n-2) {
color: var(--google-yellow-300); color: var(--paper-pink-500);
} }
.set:nth-of-type(4n-1) { .set:nth-of-type(4n-1) {

View file

@ -1,11 +1,11 @@
<!doctype html> <!doctype html>
<!-- <!--
Copyright (c) 2014 The Polymer Project Authors. All rights reserved. Copyright (c) 2014 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 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 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 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 subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
--> -->
<html> <html>
<head> <head>

View file

@ -33,14 +33,14 @@
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
}, },
"ignore": [], "ignore": [],
"homepage": "https://github.com/polymerelements/iron-overlay-behavior", "homepage": "https://github.com/PolymerElements/iron-overlay-behavior",
"_release": "1.1.2", "_release": "1.1.2",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.1.2", "tag": "v1.1.2",
"commit": "40e39a971474f48f5c2c8ee7b8568a0ad5426bd8" "commit": "40e39a971474f48f5c2c8ee7b8568a0ad5426bd8"
}, },
"_source": "git://github.com/polymerelements/iron-overlay-behavior.git", "_source": "git://github.com/PolymerElements/iron-overlay-behavior.git",
"_target": "^1.0.0", "_target": "^1.0.0",
"_originalSource": "polymerelements/iron-overlay-behavior" "_originalSource": "PolymerElements/iron-overlay-behavior"
} }

View file

@ -54,7 +54,7 @@
"tag": "v1.0.8", "tag": "v1.0.8",
"commit": "36656916b75a4715b025a03473620002c2650ee8" "commit": "36656916b75a4715b025a03473620002c2650ee8"
}, },
"_source": "git://github.com/polymerelements/neon-animation.git", "_source": "git://github.com/PolymerElements/neon-animation.git",
"_target": "^1.0.0", "_target": "^1.0.0",
"_originalSource": "polymerelements/neon-animation" "_originalSource": "PolymerElements/neon-animation"
} }

View file

@ -45,7 +45,7 @@
"tag": "v1.0.10", "tag": "v1.0.10",
"commit": "4b244a542af2c6c271498dfb98b00ed284df1d6a" "commit": "4b244a542af2c6c271498dfb98b00ed284df1d6a"
}, },
"_source": "git://github.com/PolymerElements/paper-behaviors.git", "_source": "git://github.com/polymerelements/paper-behaviors.git",
"_target": "^1.0.0", "_target": "^1.0.0",
"_originalSource": "PolymerElements/paper-behaviors" "_originalSource": "polymerelements/paper-behaviors"
} }

View file

@ -52,7 +52,7 @@
"tag": "v1.1.3", "tag": "v1.1.3",
"commit": "f070288446f9e78fbe16b032ddb429a8e8015ee7" "commit": "f070288446f9e78fbe16b032ddb429a8e8015ee7"
}, },
"_source": "git://github.com/polymerelements/paper-input.git", "_source": "git://github.com/PolymerElements/paper-input.git",
"_target": "^1.0.9", "_target": "^1.0.0",
"_originalSource": "polymerelements/paper-input" "_originalSource": "PolymerElements/paper-input"
} }

View file

@ -1,6 +1,6 @@
{ {
"name": "paper-item", "name": "paper-item",
"version": "1.1.2", "version": "1.1.3",
"description": "A material-design styled list item", "description": "A material-design styled list item",
"authors": [ "authors": [
"The Polymer Authors" "The Polymer Authors"
@ -20,7 +20,7 @@
"type": "git", "type": "git",
"url": "git://github.com/PolymerElements/paper-item" "url": "git://github.com/PolymerElements/paper-item"
}, },
"license": "MIT", "license": "http://polymer.github.io/LICENSE.txt",
"homepage": "https://github.com/PolymerElements/paper-item", "homepage": "https://github.com/PolymerElements/paper-item",
"ignore": [], "ignore": [],
"dependencies": { "dependencies": {
@ -42,11 +42,11 @@
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0", "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0",
"iron-test-helpers": "PolymerElements/iron-test-helpers#^1.0.0" "iron-test-helpers": "PolymerElements/iron-test-helpers#^1.0.0"
}, },
"_release": "1.1.2", "_release": "1.1.3",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.1.2", "tag": "v1.1.3",
"commit": "e6d048b25af0a84e1ff9f48450f07972326d476b" "commit": "280c2e703315a6f1f707bec6fd0b1e0b80fee8f4"
}, },
"_source": "git://github.com/PolymerElements/paper-item.git", "_source": "git://github.com/PolymerElements/paper-item.git",
"_target": "^1.0.0", "_target": "^1.0.0",

View file

@ -1,6 +1,6 @@
{ {
"name": "paper-item", "name": "paper-item",
"version": "1.1.2", "version": "1.1.3",
"description": "A material-design styled list item", "description": "A material-design styled list item",
"authors": [ "authors": [
"The Polymer Authors" "The Polymer Authors"
@ -20,7 +20,7 @@
"type": "git", "type": "git",
"url": "git://github.com/PolymerElements/paper-item" "url": "git://github.com/PolymerElements/paper-item"
}, },
"license": "MIT", "license": "http://polymer.github.io/LICENSE.txt",
"homepage": "https://github.com/PolymerElements/paper-item", "homepage": "https://github.com/PolymerElements/paper-item",
"ignore": [], "ignore": [],
"dependencies": { "dependencies": {

View file

@ -30,12 +30,12 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
<link rel="import" href="../paper-item-body.html"> <link rel="import" href="../paper-item-body.html">
<link rel="import" href="../../iron-flex-layout/iron-flex-layout.html"> <link rel="import" href="../../iron-flex-layout/iron-flex-layout.html">
<link rel="import" href="../../paper-styles/demo-pages.html"> <link rel="import" href="../../paper-styles/demo-pages.html">
<style is="custom-style"> <style is="custom-style">
.list { .list {
@apply(--layout-vertical);
padding-top: 12px; padding-top: 12px;
background-color: white; background-color: white;
display: inline-block;
width: 240px; width: 240px;
height: 228px; height: 228px;
margin: 12px; margin: 12px;
@ -257,7 +257,6 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
<div secondary>Personal</div> <div secondary>Personal</div>
</paper-item-body> </paper-item-body>
</paper-icon-item> </paper-icon-item>
<paper-icon-item>
</div> </div>
</div> </div>

View file

@ -9,12 +9,8 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
--> -->
<link rel="import" href="../polymer/polymer.html"> <link rel="import" href="../polymer/polymer.html">
<link rel="import" href="../iron-behaviors/iron-control-state.html">
<link rel="import" href="../iron-behaviors/iron-button-state.html">
<link rel="import" href="../iron-flex-layout/iron-flex-layout.html"> <link rel="import" href="../iron-flex-layout/iron-flex-layout.html">
<link rel="import" href="../paper-styles/typography.html"> <link rel="import" href="../paper-styles/typography.html">
<link rel="import" href="../paper-styles/color.html">
<link rel="import" href="../paper-styles/default-theme.html">
<link rel="import" href="paper-item-behavior.html"> <link rel="import" href="paper-item-behavior.html">
<link rel="import" href="paper-item-shared-styles.html"> <link rel="import" href="paper-item-shared-styles.html">
@ -63,9 +59,10 @@ Custom property | Description |
} }
.content-icon { .content-icon {
width: var(--paper-item-icon-width, 56px);
@apply(--layout-horizontal); @apply(--layout-horizontal);
@apply(--layout-center); @apply(--layout-center);
width: var(--paper-item-icon-width, 56px);
} }
</style> </style>

View file

@ -9,8 +9,8 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
--> -->
<link rel="import" href="../polymer/polymer.html"> <link rel="import" href="../polymer/polymer.html">
<link rel="import" href="../iron-behaviors/iron-control-state.html">
<link rel="import" href="../iron-behaviors/iron-button-state.html"> <link rel="import" href="../iron-behaviors/iron-button-state.html">
<link rel="import" href="../iron-behaviors/iron-control-state.html">
<!-- <!--
`PaperItemBehavior` is a convenience behavior shared by <paper-item> and `PaperItemBehavior` is a convenience behavior shared by <paper-item> and
@ -29,9 +29,8 @@ the items.
/** @polymerBehavior */ /** @polymerBehavior */
Polymer.PaperItemBehavior = [ Polymer.PaperItemBehavior = [
Polymer.IronControlState,
Polymer.IronButtonState, Polymer.IronButtonState,
Polymer.IronControlState,
Polymer.PaperItemBehaviorImpl Polymer.PaperItemBehaviorImpl
]; ];
</script> </script>

View file

@ -11,8 +11,8 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
<link rel="import" href="../polymer/polymer.html"> <link rel="import" href="../polymer/polymer.html">
<link rel="import" href="../iron-flex-layout/iron-flex-layout.html"> <link rel="import" href="../iron-flex-layout/iron-flex-layout.html">
<link rel="import" href="../paper-styles/default-theme.html"> <link rel="import" href="../paper-styles/default-theme.html">
<link rel="import" href="../paper-styles/color.html">
<link rel="import" href="../paper-styles/typography.html"> <link rel="import" href="../paper-styles/typography.html">
<!-- <!--
Use `<paper-item-body>` in a `<paper-item>` or `<paper-icon-item>` to make two- or Use `<paper-item-body>` in a `<paper-item>` or `<paper-icon-item>` to make two- or
three- line items. It is a flex item that is a vertical flexbox. three- line items. It is a flex item that is a vertical flexbox.
@ -58,15 +58,16 @@ Custom property | Description | Default
} }
:host > ::content > * { :host > ::content > * {
white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap;
} }
:host > ::content [secondary] { :host > ::content [secondary] {
color: var(--paper-item-body-secondary-color, --secondary-text-color);
@apply(--paper-font-body1); @apply(--paper-font-body1);
color: var(--paper-item-body-secondary-color, --secondary-text-color);
@apply(--paper-item-body-secondary); @apply(--paper-item-body-secondary);
} }
</style> </style>

View file

@ -8,35 +8,48 @@ 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
--> -->
<link rel="import" href="../iron-flex-layout/iron-flex-layout.html">
<link rel="import" href="../paper-styles/default-theme.html">
<link rel="import" href="../paper-styles/color.html">
<dom-module id="paper-item-shared-styles"> <dom-module id="paper-item-shared-styles">
<template> <template>
<style> <style>
:host { :host {
display: block; display: block;
position: relative;
min-height: var(--paper-item-min-height, 48px); min-height: var(--paper-item-min-height, 48px);
padding: 0px 16px; padding: 0px 16px;
} }
:host([hidden]) {
display: none !important;
}
:host(.iron-selected) { :host(.iron-selected) {
font-weight: var(--paper-item-selected-weight, bold); font-weight: var(--paper-item-selected-weight, bold);
@apply(--paper-item-selected); @apply(--paper-item-selected);
} }
:host([disabled]) { :host([disabled]) {
color: var(--paper-item-disabled-color, --disabled-text-color); color: var(--paper-item-disabled-color, --disabled-text-color);
@apply(--paper-item-disabled); @apply(--paper-item-disabled);
} }
:host(:focus) { :host(:focus) {
position: relative; position: relative;
outline: 0; outline: 0;
@apply(--paper-item-focused); @apply(--paper-item-focused);
} }
:host(:focus):before { :host(:focus):before {
@apply(--layout-fit); @apply(--layout-fit);
content: '';
background: currentColor; background: currentColor;
content: '';
opacity: var(--dark-divider-opacity); opacity: var(--dark-divider-opacity);
pointer-events: none; pointer-events: none;

View file

@ -9,11 +9,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
--> -->
<link rel="import" href="../polymer/polymer.html"> <link rel="import" href="../polymer/polymer.html">
<link rel="import" href="../iron-behaviors/iron-control-state.html">
<link rel="import" href="../iron-behaviors/iron-button-state.html">
<link rel="import" href="../iron-flex-layout/iron-flex-layout.html"> <link rel="import" href="../iron-flex-layout/iron-flex-layout.html">
<link rel="import" href="../paper-styles/default-theme.html">
<link rel="import" href="../paper-styles/color.html">
<link rel="import" href="paper-item-behavior.html"> <link rel="import" href="paper-item-behavior.html">
<link rel="import" href="paper-item-shared-styles.html"> <link rel="import" href="paper-item-shared-styles.html">
@ -40,7 +36,7 @@ items.
The following custom properties and mixins are available for styling: The following custom properties and mixins are available for styling:
Custom property | Description | Default Custom property | Description | Default
------------------------------|------------------------------------------------|---------- ------------------------------|----------------------------------------------|----------
`--paper-item-min-height` | Minimum height of the item | `48px` `--paper-item-min-height` | Minimum height of the item | `48px`
`--paper-item` | Mixin applied to the item | `{}` `--paper-item` | Mixin applied to the item | `{}`
`--paper-item-selected-weight`| The font weight of a selected item | `bold` `--paper-item-selected-weight`| The font weight of a selected item | `bold`

View file

@ -1,6 +1,6 @@
{ {
"name": "paper-styles", "name": "paper-styles",
"version": "1.1.0", "version": "1.1.1",
"description": "Common (global) styles for Material Design elements.", "description": "Common (global) styles for Material Design elements.",
"authors": [ "authors": [
"The Polymer Authors" "The Polymer Authors"
@ -29,11 +29,11 @@
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0", "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0",
"iron-component-page": "polymerelements/iron-component-page#^1.0.0" "iron-component-page": "polymerelements/iron-component-page#^1.0.0"
}, },
"_release": "1.1.0", "_release": "1.1.1",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "1.1.0", "tag": "v1.1.1",
"commit": "4104485003ccbcf2c3c9eb542156930974294525" "commit": "fc3ca8dcfc69b9c7a7261e51eefc9741d0f113f8"
}, },
"_source": "git://github.com/PolymerElements/paper-styles.git", "_source": "git://github.com/PolymerElements/paper-styles.git",
"_target": "^1.0.0", "_target": "^1.0.0",

View file

@ -1,6 +1,6 @@
{ {
"name": "paper-styles", "name": "paper-styles",
"version": "1.1.0", "version": "1.1.1",
"description": "Common (global) styles for Material Design elements.", "description": "Common (global) styles for Material Design elements.",
"authors": [ "authors": [
"The Polymer Authors" "The Polymer Authors"

View file

@ -38,8 +38,8 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
/* /*
* Primary and accent colors. Also see color.html for more colors. * Primary and accent colors. Also see color.html for more colors.
*/ */
--primary-color: #3f51b5; /* --paper-indigo-500 */
--light-primary-color: #c5cae9; /* --paper-indigo-100 */ --light-primary-color: #c5cae9; /* --paper-indigo-100 */
--default-primary-color: #3f51b5; /* --paper-indigo-500 */
--dark-primary-color: #303f9f; /* --paper-indigo-700 */ --dark-primary-color: #303f9f; /* --paper-indigo-700 */
--accent-color: #ff4081; /* --paper-pink-a200 */ --accent-color: #ff4081; /* --paper-pink-a200 */
@ -55,6 +55,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
--secondary-text-color: var(--light-theme-secondary-color); --secondary-text-color: var(--light-theme-secondary-color);
--disabled-text-color:var(--light-theme-disabled-color); --disabled-text-color:var(--light-theme-disabled-color);
--divider-color: var(--light-theme-divider-color); --divider-color: var(--light-theme-divider-color);
--default-primary-color: var(--primary-color);
} }
</style> </style>

View file

@ -24,14 +24,14 @@
"web-component-tester": "*" "web-component-tester": "*"
}, },
"private": true, "private": true,
"homepage": "https://github.com/polymer/polymer", "homepage": "https://github.com/Polymer/polymer",
"_release": "1.2.3", "_release": "1.2.3",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.2.3", "tag": "v1.2.3",
"commit": "aa535d1675342007cbf64dc9c66497cf74cbc616" "commit": "aa535d1675342007cbf64dc9c66497cf74cbc616"
}, },
"_source": "git://github.com/polymer/polymer.git", "_source": "git://github.com/Polymer/polymer.git",
"_target": "^1.0.0", "_target": "^1.0.0",
"_originalSource": "polymer/polymer" "_originalSource": "Polymer/polymer"
} }