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 2016-04-22 12:25:52 -04:00
parent 3d5279a0de
commit c53f83fb55
7 changed files with 60 additions and 27 deletions

View file

@ -16,12 +16,12 @@
}, },
"devDependencies": {}, "devDependencies": {},
"ignore": [], "ignore": [],
"version": "1.1.52", "version": "1.1.53",
"_release": "1.1.52", "_release": "1.1.53",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "1.1.52", "tag": "1.1.53",
"commit": "e3d1b76fb2c7820d5584d2f3f97fed687a0f9ae2" "commit": "9444540a862f03f8aac0f2cd78e2da53ffe196d0"
}, },
"_source": "https://github.com/MediaBrowser/Emby.ApiClient.Javascript.git", "_source": "https://github.com/MediaBrowser/Emby.ApiClient.Javascript.git",
"_target": "^1.1.51", "_target": "^1.1.51",

View file

@ -141,7 +141,7 @@
{ {
url: url, url: url,
status: response.status, status: response.status,
errorCode: response.headers ? response.headers["X-Application-Error-Code"] : null errorCode: response.headers ? response.headers.get('X-Application-Error-Code') : null
}]); }]);
} }

View file

@ -14,12 +14,12 @@
"package.json" "package.json"
], ],
"homepage": "https://github.com/hammerjs/hammer.js", "homepage": "https://github.com/hammerjs/hammer.js",
"version": "2.0.7", "version": "2.0.8",
"_release": "2.0.7", "_release": "2.0.8",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v2.0.7", "tag": "v2.0.8",
"commit": "f2e4c826df0117c5c927618a1b335c20681e6978" "commit": "ee611316bec077fcfbba3fd604ebc4b0b35ac288"
}, },
"_source": "https://github.com/hammerjs/hammer.js.git", "_source": "https://github.com/hammerjs/hammer.js.git",
"_target": "~2.0.4", "_target": "~2.0.4",

View file

@ -1,8 +1,8 @@
/*! Hammer.JS - v2.0.6 - 2016-04-21 /*! Hammer.JS - v2.0.7 - 2016-04-22
* http://hammerjs.github.io/ * http://hammerjs.github.io/
* *
* Copyright (c) 2016 Jorik Tangelder; * Copyright (c) 2016 Jorik Tangelder;
* Licensed under the license */ * Licensed under the MIT license */
(function(window, document, exportName, undefined) { (function(window, document, exportName, undefined) {
'use strict'; 'use strict';
@ -1194,6 +1194,7 @@ var TOUCH_ACTION_MANIPULATION = 'manipulation'; // not implemented
var TOUCH_ACTION_NONE = 'none'; var TOUCH_ACTION_NONE = 'none';
var TOUCH_ACTION_PAN_X = 'pan-x'; var TOUCH_ACTION_PAN_X = 'pan-x';
var TOUCH_ACTION_PAN_Y = 'pan-y'; var TOUCH_ACTION_PAN_Y = 'pan-y';
var TOUCH_ACTION_MAP = getTouchActionProps();
/** /**
* Touch Action * Touch Action
@ -1218,7 +1219,7 @@ TouchAction.prototype = {
value = this.compute(); value = this.compute();
} }
if (NATIVE_TOUCH_ACTION && this.manager.element.style) { if (NATIVE_TOUCH_ACTION && this.manager.element.style && TOUCH_ACTION_MAP[value]) {
this.manager.element.style[PREFIXED_TOUCH_ACTION] = value; this.manager.element.style[PREFIXED_TOUCH_ACTION] = value;
} }
this.actions = value.toLowerCase().trim(); this.actions = value.toLowerCase().trim();
@ -1250,11 +1251,6 @@ TouchAction.prototype = {
* @param {Object} input * @param {Object} input
*/ */
preventDefaults: function(input) { preventDefaults: function(input) {
// not needed with native support for the touchAction property
if (NATIVE_TOUCH_ACTION) {
return;
}
var srcEvent = input.srcEvent; var srcEvent = input.srcEvent;
var direction = input.offsetDirection; var direction = input.offsetDirection;
@ -1265,9 +1261,9 @@ TouchAction.prototype = {
} }
var actions = this.actions; var actions = this.actions;
var hasNone = inStr(actions, TOUCH_ACTION_NONE); var hasNone = inStr(actions, TOUCH_ACTION_NONE) && !TOUCH_ACTION_MAP[TOUCH_ACTION_NONE];
var hasPanY = inStr(actions, TOUCH_ACTION_PAN_Y); var hasPanY = inStr(actions, TOUCH_ACTION_PAN_Y) && !TOUCH_ACTION_MAP[TOUCH_ACTION_PAN_Y];
var hasPanX = inStr(actions, TOUCH_ACTION_PAN_X); var hasPanX = inStr(actions, TOUCH_ACTION_PAN_X) && !TOUCH_ACTION_MAP[TOUCH_ACTION_PAN_X];
if (hasNone) { if (hasNone) {
//do not prevent defaults if this is a tap gesture //do not prevent defaults if this is a tap gesture
@ -1338,6 +1334,21 @@ function cleanTouchActions(actions) {
return TOUCH_ACTION_AUTO; return TOUCH_ACTION_AUTO;
} }
function getTouchActionProps() {
if (!NATIVE_TOUCH_ACTION) {
return false;
}
var touchMap = {};
var cssSupports = window.CSS && window.CSS.supports;
['auto', 'manipulation', 'pan-y', 'pan-x', 'pan-x pan-y', 'none'].forEach(function(val) {
// If css.supports is not supported but there is native touch-action assume it supports
// all values. This is the case for IE 10 and 11.
touchMap[val] = cssSupports ? window.CSS.supports('touch-action', val) : true;
});
return touchMap;
}
/** /**
* Recognizer flow explained; * * Recognizer flow explained; *
* All recognizers have the initial state of POSSIBLE when a input session starts. * All recognizers have the initial state of POSSIBLE when a input session starts.
@ -2134,7 +2145,7 @@ function Hammer(element, options) {
/** /**
* @const {string} * @const {string}
*/ */
Hammer.VERSION = '2.0.6'; Hammer.VERSION = '2.0.7';
/** /**
* default settings * default settings
@ -2265,6 +2276,7 @@ function Manager(element, options) {
this.handlers = {}; this.handlers = {};
this.session = {}; this.session = {};
this.recognizers = []; this.recognizers = [];
this.oldCssProps = {};
this.element = element; this.element = element;
this.input = createInputInstance(this); this.input = createInputInstance(this);
@ -2443,6 +2455,13 @@ Manager.prototype = {
* @returns {EventEmitter} this * @returns {EventEmitter} this
*/ */
on: function(events, handler) { on: function(events, handler) {
if (events === undefined) {
return;
}
if (handler === undefined) {
return;
}
var handlers = this.handlers; var handlers = this.handlers;
each(splitStr(events), function(event) { each(splitStr(events), function(event) {
handlers[event] = handlers[event] || []; handlers[event] = handlers[event] || [];
@ -2458,6 +2477,10 @@ Manager.prototype = {
* @returns {EventEmitter} this * @returns {EventEmitter} this
*/ */
off: function(events, handler) { off: function(events, handler) {
if (events === undefined) {
return;
}
var handlers = this.handlers; var handlers = this.handlers;
each(splitStr(events), function(event) { each(splitStr(events), function(event) {
if (!handler) { if (!handler) {
@ -2522,9 +2545,19 @@ function toggleCssProps(manager, add) {
if (!element.style) { if (!element.style) {
return; return;
} }
var prop;
each(manager.options.cssProps, function(value, name) { each(manager.options.cssProps, function(value, name) {
element.style[prefixed(element.style, name)] = add ? value : ''; prop = prefixed(element.style, name);
if (add) {
manager.oldCssProps[prop] = element.style[prop];
element.style[prop] = value;
} else {
element.style[prop] = manager.oldCssProps[prop] || '';
}
}); });
if (!add) {
manager.oldCssProps = {};
}
} }
/** /**

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -34,6 +34,6 @@
"commit": "11c987b2eb3c73b388a79fc8aaea8ca01624f514" "commit": "11c987b2eb3c73b388a79fc8aaea8ca01624f514"
}, },
"_source": "git://github.com/Polymer/polymer.git", "_source": "git://github.com/Polymer/polymer.git",
"_target": "^1.0.0", "_target": "^1.1.0",
"_originalSource": "Polymer/polymer" "_originalSource": "Polymer/polymer"
} }