update recording layout
This commit is contained in:
@@ -14,12 +14,12 @@
|
||||
},
|
||||
"devDependencies": {},
|
||||
"ignore": [],
|
||||
"version": "1.4.212",
|
||||
"_release": "1.4.212",
|
||||
"version": "1.4.213",
|
||||
"_release": "1.4.213",
|
||||
"_resolution": {
|
||||
"type": "version",
|
||||
"tag": "1.4.212",
|
||||
"commit": "45cf1768cae1cc5bf3761a7154c429dffbd78378"
|
||||
"tag": "1.4.213",
|
||||
"commit": "5db5ff0f3a13742f310688474a22b44e0d38cee5"
|
||||
},
|
||||
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
|
||||
"_target": "^1.2.1",
|
||||
|
||||
+28
-18
@@ -238,17 +238,6 @@
|
||||
//var eventName = browser.firefox ? 'mousedown' : 'click';
|
||||
var selectedId;
|
||||
|
||||
dlg.addEventListener('click', function (e) {
|
||||
|
||||
var actionSheetMenuItem = dom.parentWithClass(e.target, 'actionSheetMenuItem');
|
||||
|
||||
if (actionSheetMenuItem) {
|
||||
selectedId = actionSheetMenuItem.getAttribute('data-id');
|
||||
dialogHelper.close(dlg);
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
var timeout;
|
||||
if (options.timeout) {
|
||||
timeout = setTimeout(function () {
|
||||
@@ -258,6 +247,25 @@
|
||||
|
||||
return new Promise(function (resolve, reject) {
|
||||
|
||||
var isResolved;
|
||||
|
||||
dlg.addEventListener('click', function (e) {
|
||||
|
||||
var actionSheetMenuItem = dom.parentWithClass(e.target, 'actionSheetMenuItem');
|
||||
|
||||
if (actionSheetMenuItem) {
|
||||
selectedId = actionSheetMenuItem.getAttribute('data-id');
|
||||
|
||||
if (options.resolveOnClick) {
|
||||
resolve(selectedId);
|
||||
isResolved = true;
|
||||
}
|
||||
|
||||
dialogHelper.close(dlg);
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
dlg.addEventListener('close', function () {
|
||||
|
||||
if (layoutManager.tv) {
|
||||
@@ -269,14 +277,16 @@
|
||||
timeout = null;
|
||||
}
|
||||
|
||||
if (selectedId != null) {
|
||||
if (options.callback) {
|
||||
options.callback(selectedId);
|
||||
}
|
||||
if (!isResolved) {
|
||||
if (selectedId != null) {
|
||||
if (options.callback) {
|
||||
options.callback(selectedId);
|
||||
}
|
||||
|
||||
resolve(selectedId);
|
||||
} else {
|
||||
reject();
|
||||
resolve(selectedId);
|
||||
} else {
|
||||
reject();
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
@@ -395,7 +395,7 @@ define(['browser'], function (browser) {
|
||||
Container: 'mkv',
|
||||
Type: 'Video',
|
||||
AudioCodec: videoAudioCodecs.join(','),
|
||||
VideoCodec: 'h264',
|
||||
VideoCodec: 'copy',
|
||||
Context: 'Streaming',
|
||||
CopyTimestamps: copyTimestamps
|
||||
});
|
||||
|
||||
+1
-3
@@ -861,10 +861,8 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo
|
||||
|
||||
if (options.showProgramAirInfo) {
|
||||
|
||||
var date = datetime.parseISO8601Date(item.StartDate, true);
|
||||
|
||||
var text = item.StartDate ?
|
||||
date.toLocaleString() :
|
||||
datetime.toLocaleString(datetime.parseISO8601Date(item.StartDate, true)) :
|
||||
'';
|
||||
|
||||
lines.push(text || ' ');
|
||||
|
||||
@@ -103,6 +103,14 @@
|
||||
return false;
|
||||
}();
|
||||
|
||||
function toLocaleString(date) {
|
||||
var currentLocale = globalize.getCurrentLocale();
|
||||
|
||||
return currentLocale && toLocaleTimeStringSupportsLocales ?
|
||||
date.toLocaleString(currentLocale) :
|
||||
date.toLocaleString();
|
||||
}
|
||||
|
||||
function toLocaleDateString(date) {
|
||||
|
||||
var currentLocale = globalize.getCurrentLocale();
|
||||
@@ -178,6 +186,7 @@
|
||||
parseISO8601Date: parseISO8601Date,
|
||||
getDisplayRunningTime: getDisplayRunningTime,
|
||||
toLocaleDateString: toLocaleDateString,
|
||||
toLocaleString: toLocaleString,
|
||||
getDisplayTime: getDisplayTime,
|
||||
isRelativeDay: isRelativeDay
|
||||
};
|
||||
|
||||
@@ -559,6 +559,11 @@ define([], function () {
|
||||
}
|
||||
|
||||
page.pushState = function (state, title, url) {
|
||||
|
||||
if (hashbang) {
|
||||
url = '#!' + url;
|
||||
}
|
||||
|
||||
history.pushState(state, title, url);
|
||||
previousPopState = state;
|
||||
};
|
||||
|
||||
+3
-3
@@ -32,14 +32,14 @@
|
||||
"iron-component-page": "polymerElements/iron-component-page#^1.1.6"
|
||||
},
|
||||
"private": true,
|
||||
"homepage": "https://github.com/polymer/polymer",
|
||||
"homepage": "https://github.com/Polymer/polymer",
|
||||
"_release": "1.6.1",
|
||||
"_resolution": {
|
||||
"type": "version",
|
||||
"tag": "v1.6.1",
|
||||
"commit": "1f197d9d7874b1e5808b2a5c26f34446a7d912fc"
|
||||
},
|
||||
"_source": "git://github.com/polymer/polymer.git",
|
||||
"_source": "git://github.com/Polymer/polymer.git",
|
||||
"_target": "^1.1.0",
|
||||
"_originalSource": "polymer/polymer"
|
||||
"_originalSource": "Polymer/polymer"
|
||||
}
|
||||
+5
-5
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "requirejs",
|
||||
"version": "2.2.0",
|
||||
"version": "2.3.0",
|
||||
"ignore": [],
|
||||
"homepage": "http://requirejs.org",
|
||||
"authors": [
|
||||
@@ -14,13 +14,13 @@
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"_release": "2.2.0",
|
||||
"_release": "2.3.0",
|
||||
"_resolution": {
|
||||
"type": "version",
|
||||
"tag": "2.2.0",
|
||||
"commit": "1da07057390909f5422c5fd4fb18b6b57cf92b66"
|
||||
"tag": "2.3.0",
|
||||
"commit": "49ddc059ef857de683315001bb8721d17c1686d6"
|
||||
},
|
||||
"_source": "git://github.com/jrburke/requirejs-bower.git",
|
||||
"_source": "https://github.com/jrburke/requirejs-bower.git",
|
||||
"_target": "^2.1.22",
|
||||
"_originalSource": "requirejs"
|
||||
}
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "requirejs",
|
||||
"version": "2.2.0",
|
||||
"version": "2.3.0",
|
||||
"ignore": [],
|
||||
"homepage": "http://requirejs.org",
|
||||
"authors": [
|
||||
|
||||
+7
-7
@@ -1,6 +1,6 @@
|
||||
/** vim: et:ts=4:sw=4:sts=4
|
||||
* @license RequireJS 2.2.0 Copyright jQuery Foundation and other contributors.
|
||||
* Released under MIT license, http://github.com/requirejs/requirejs/LICENSE
|
||||
* @license RequireJS 2.3.0 Copyright jQuery Foundation and other contributors.
|
||||
* Released under MIT license, https://github.com/requirejs/requirejs/blob/master/LICENSE
|
||||
*/
|
||||
//Not using strict: uneven strict support in browsers, #392, and causes
|
||||
//problems with requirejs.exec()/transpiler plugins that may not be strict.
|
||||
@@ -8,11 +8,11 @@
|
||||
/*global window, navigator, document, importScripts, setTimeout, opera */
|
||||
|
||||
var requirejs, require, define;
|
||||
(function (global) {
|
||||
(function (global, setTimeout) {
|
||||
var req, s, head, baseElement, dataMain, src,
|
||||
interactiveScript, currentlyAddingScript, mainScript, subPath,
|
||||
version = '2.2.0',
|
||||
commentRegExp = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg,
|
||||
version = '2.3.0',
|
||||
commentRegExp = /\/\*[\s\S]*?\*\/|([^:"'=]|^)\/\/.*$/mg,
|
||||
cjsRequireRegExp = /[^.]\s*require\s*\(\s*["']([^'"\s]+)["']\s*\)/g,
|
||||
jsSuffixRegExp = /\.js$/,
|
||||
currDirRegExp = /^\.\//,
|
||||
@@ -36,7 +36,7 @@ var requirejs, require, define;
|
||||
useInteractive = false;
|
||||
|
||||
//Could match something like ')//comment', do not lose the prefix to comment.
|
||||
function commentReplace(match, multi, multiText, singlePrefix) {
|
||||
function commentReplace(match, singlePrefix) {
|
||||
return singlePrefix || '';
|
||||
}
|
||||
|
||||
@@ -2139,4 +2139,4 @@ var requirejs, require, define;
|
||||
|
||||
//Set up with config info.
|
||||
req(cfg);
|
||||
}(this));
|
||||
}(this, setTimeout));
|
||||
|
||||
Reference in New Issue
Block a user