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

fix events

Browse source
This commit is contained in:
Luke Pulverenti 2015-11-29 13:16:42 -05:00
parent 7743007ece
commit 39965a9b6b
6 changed files with 11 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

12
dashboard-ui/apiclient/apiclient.js
View file

@ -128,16 +128,6 @@
return val.substring(val.indexOf('=') + 1).replace("'", '%27'); return val.substring(val.indexOf('=') + 1).replace("'", '%27');
}; };
function onRequestFail(e) {
Events.trigger(self, 'requestfail', [
{
url: this.url,
status: e.status,
errorCode: e.getResponseHeader("X-Application-Error-Code")
}]);
}
function onFetchFail(url, response) { function onFetchFail(url, response) {
Events.trigger(self, 'requestfail', [ Events.trigger(self, 'requestfail', [
@ -426,7 +416,7 @@
var value = params[key]; var value = params[key];
if (value) { if (value !== null && value !== undefined && value !== '') {
values.push(encodeURIComponent(key) + "=" + encodeURIComponent(value)); values.push(encodeURIComponent(key) + "=" + encodeURIComponent(value));
} }
} }

2
dashboard-ui/bower_components/eventie/.bower.json vendored
View file

@ -30,6 +30,6 @@
"commit": "14d2ca3df97da64c820829a8310f9198fbafbcfa" "commit": "14d2ca3df97da64c820829a8310f9198fbafbcfa"
}, },
"_source": "git://github.com/desandro/eventie.git", "_source": "git://github.com/desandro/eventie.git",
"_target": "~1.0.3", "_target": "^1",
"_originalSource": "eventie" "_originalSource": "eventie"
} }

2
dashboard-ui/bower_components/get-style-property/.bower.json vendored
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"
} }

6
dashboard-ui/bower_components/iron-a11y-keys-behavior/.bower.json vendored
View file

@ -30,14 +30,14 @@
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
}, },
"ignore": [], "ignore": [],
"homepage": "https://github.com/PolymerElements/iron-a11y-keys-behavior", "homepage": "https://github.com/polymerelements/iron-a11y-keys-behavior",
"_release": "1.1.0", "_release": "1.1.0",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.1.0", "tag": "v1.1.0",
"commit": "cd8c972278c0d916bef57209d7dce5b81e67687c" "commit": "cd8c972278c0d916bef57209d7dce5b81e67687c"
}, },
"_source": "git://github.com/PolymerElements/iron-a11y-keys-behavior.git", "_source": "git://github.com/polymerelements/iron-a11y-keys-behavior.git",
"_target": "^1.0.0", "_target": "^1.0.0",
"_originalSource": "PolymerElements/iron-a11y-keys-behavior" "_originalSource": "polymerelements/iron-a11y-keys-behavior"
} }

6
dashboard-ui/bower_components/iron-flex-layout/.bower.json vendored
View file

@ -28,14 +28,14 @@
"iron-component-page": "polymerelements/iron-component-page#^1.0.0" "iron-component-page": "polymerelements/iron-component-page#^1.0.0"
}, },
"ignore": [], "ignore": [],
"homepage": "https://github.com/PolymerElements/iron-flex-layout", "homepage": "https://github.com/polymerelements/iron-flex-layout",
"_release": "1.2.1", "_release": "1.2.1",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.2.1", "tag": "v1.2.1",
"commit": "ebda425d92e20af300e2e175e5ef234b89a32486" "commit": "ebda425d92e20af300e2e175e5ef234b89a32486"
}, },
"_source": "git://github.com/PolymerElements/iron-flex-layout.git", "_source": "git://github.com/polymerelements/iron-flex-layout.git",
"_target": "^1.0.0", "_target": "^1.0.0",
"_originalSource": "PolymerElements/iron-flex-layout" "_originalSource": "polymerelements/iron-flex-layout"
} }

9
dashboard-ui/scripts/librarylist.js
View file

@ -639,15 +639,9 @@
return; return;
} }
var buttonParents = $(target).parents('a:not(.card,.cardContent),button:not(.card,.cardContent)');
if (buttonParents.length) {
return;
}
ApiClient.getJSON(ApiClient.getUrl('Users/' + userId + '/Items/Latest', options)).then(function (items) { ApiClient.getJSON(ApiClient.getUrl('Users/' + userId + '/Items/Latest', options)).then(function (items) {
if (items.length == 1) { if (items.length == 1) {
Dashboard.navigate(LibraryBrowser.getHref(items[0], context)); Dashboard.navigate(LibraryBrowser.getHref(items[0], context));
return; return;
} }
@ -656,10 +650,11 @@
if (context) { if (context) {
url += '&context=' + context; url += '&context=' + context;
} }
Dashboard.navigate(url);
Dashboard.navigate(url);
}); });
e.stopPropagation();
e.preventDefault(); e.preventDefault();
return false; return false;
} }