diff --git a/dashboard-ui/bower_components/emby-webcomponents/.bower.json b/dashboard-ui/bower_components/emby-webcomponents/.bower.json index be5b9e47f5..c94c13339e 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/.bower.json +++ b/dashboard-ui/bower_components/emby-webcomponents/.bower.json @@ -16,12 +16,12 @@ }, "devDependencies": {}, "ignore": [], - "version": "1.2.50", - "_release": "1.2.50", + "version": "1.2.51", + "_release": "1.2.51", "_resolution": { "type": "version", - "tag": "1.2.50", - "commit": "b58b3517bb892e0cde54a8a5f5bf318248f0eb13" + "tag": "1.2.51", + "commit": "0de31178ecd029314513167a880a1cf645140917" }, "_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_target": "^1.2.0", diff --git a/dashboard-ui/bower_components/emby-webcomponents/guide/guide.css b/dashboard-ui/bower_components/emby-webcomponents/guide/guide.css index 6aa8f2602f..d00f60f63f 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/guide/guide.css +++ b/dashboard-ui/bower_components/emby-webcomponents/guide/guide.css @@ -378,7 +378,7 @@ .guideChannelName { margin-left: auto; margin-right: 1em; - max-width: 50%; + max-width: 40%; text-overflow: ellipsis; overflow: hidden; } diff --git a/dashboard-ui/bower_components/emby-webcomponents/sharing/sharingmanager.js b/dashboard-ui/bower_components/emby-webcomponents/sharing/sharingmanager.js new file mode 100644 index 0000000000..ed938176bd --- /dev/null +++ b/dashboard-ui/bower_components/emby-webcomponents/sharing/sharingmanager.js @@ -0,0 +1,60 @@ +define(['connectionManager', 'sharingMenu', 'loading'], function (connectionManager, sharingMenu, loading) { + + function onSharingSuccess(options) { + + console.log('share success. shareId: ' + options.share.Id); + } + + function onSharingCancel(options, apiClient) { + + var shareId = options.share.Id; + + console.log('share cancelled. shareId: ' + shareId); + + // Delete the share since it was cancelled + apiClient.ajax({ + + type: 'DELETE', + url: apiClient.getUrl('Social/Shares/' + shareId) + + }); + } + + function showMenu(apiClient, itemId) { + + loading.show(); + var userId = apiClient.getCurrentUserId(); + + return apiClient.getItem(userId, itemId).then(function () { + + return apiClient.ajax({ + type: 'POST', + url: apiClient.getUrl('Social/Shares', { + + ItemId: itemId, + UserId: userId + }), + dataType: "json" + + }).then(function (share) { + + var options = { + share: share + }; + + loading.hide(); + sharingMenu.showMenu(options, onSharingSuccess, function (options) { + onSharingCancel(options, apiClient); + }); + + }, function () { + + loading.hide(); + }); + }); + } + + return { + showMenu: showMenu + }; +}); \ No newline at end of file diff --git a/dashboard-ui/bower_components/iron-a11y-keys-behavior/.bower.json b/dashboard-ui/bower_components/iron-a11y-keys-behavior/.bower.json index 9604c48b0b..f920799d20 100644 --- a/dashboard-ui/bower_components/iron-a11y-keys-behavior/.bower.json +++ b/dashboard-ui/bower_components/iron-a11y-keys-behavior/.bower.json @@ -30,14 +30,14 @@ "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" }, "ignore": [], - "homepage": "https://github.com/PolymerElements/iron-a11y-keys-behavior", + "homepage": "https://github.com/polymerelements/iron-a11y-keys-behavior", "_release": "1.1.2", "_resolution": { "type": "version", "tag": "v1.1.2", "commit": "0c2330c229a6fd3d200e2b84147ec6f94f17c22d" }, - "_source": "git://github.com/PolymerElements/iron-a11y-keys-behavior.git", + "_source": "git://github.com/polymerelements/iron-a11y-keys-behavior.git", "_target": "^1.0.0", - "_originalSource": "PolymerElements/iron-a11y-keys-behavior" + "_originalSource": "polymerelements/iron-a11y-keys-behavior" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/iron-meta/.bower.json b/dashboard-ui/bower_components/iron-meta/.bower.json index f4bfef4a7c..e1304d174b 100644 --- a/dashboard-ui/bower_components/iron-meta/.bower.json +++ b/dashboard-ui/bower_components/iron-meta/.bower.json @@ -26,14 +26,14 @@ "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" }, "main": "iron-meta.html", - "homepage": "https://github.com/polymerelements/iron-meta", + "homepage": "https://github.com/PolymerElements/iron-meta", "_release": "1.1.1", "_resolution": { "type": "version", "tag": "v1.1.1", "commit": "e171ee234b482219c9514e6f9551df48ef48bd9f" }, - "_source": "git://github.com/polymerelements/iron-meta.git", + "_source": "git://github.com/PolymerElements/iron-meta.git", "_target": "^1.0.0", - "_originalSource": "polymerelements/iron-meta" + "_originalSource": "PolymerElements/iron-meta" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/polymer/.bower.json b/dashboard-ui/bower_components/polymer/.bower.json index 3e8a4009a3..bbad7fe7ba 100644 --- a/dashboard-ui/bower_components/polymer/.bower.json +++ b/dashboard-ui/bower_components/polymer/.bower.json @@ -34,6 +34,6 @@ "commit": "11c987b2eb3c73b388a79fc8aaea8ca01624f514" }, "_source": "git://github.com/Polymer/polymer.git", - "_target": "^1.0.0", + "_target": "^1.1.0", "_originalSource": "Polymer/polymer" } \ No newline at end of file diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js index 23dd2d2e41..aa5beb5142 100644 --- a/dashboard-ui/scripts/librarybrowser.js +++ b/dashboard-ui/scripts/librarybrowser.js @@ -960,8 +960,8 @@ switch (id) { case 'share': - require(['sharingmanager'], function () { - SharingManager.showMenu(Dashboard.getCurrentUserId(), itemId); + require(['sharingmanager'], function (sharingManager) { + sharingManager.showMenu(ApiClient, itemId); }); break; case 'addtocollection': diff --git a/dashboard-ui/scripts/librarylist.js b/dashboard-ui/scripts/librarylist.js index 556af2ec62..fa4bce8d64 100644 --- a/dashboard-ui/scripts/librarylist.js +++ b/dashboard-ui/scripts/librarylist.js @@ -576,8 +576,8 @@ LibraryBrowser.playInExternalPlayer(itemId); break; case 'share': - require(['sharingmanager'], function () { - SharingManager.showMenu(Dashboard.getCurrentUserId(), itemId); + require(['sharingmanager'], function (sharingManager) { + sharingManager.showMenu(ApiClient, itemId); }); break; case 'removefromplaylist': diff --git a/dashboard-ui/scripts/sharingmanager.js b/dashboard-ui/scripts/sharingmanager.js deleted file mode 100644 index 0472679add..0000000000 --- a/dashboard-ui/scripts/sharingmanager.js +++ /dev/null @@ -1,59 +0,0 @@ -define([], function () { - - function onSharingSuccess(options) { - - console.log('share success. shareId: ' + options.share.Id); - - } - - function onSharingCancel(options) { - - var shareId = options.share.Id; - - console.log('share cancelled. shareId: ' + shareId); - - // Delete the share since it was cancelled - ApiClient.ajax({ - - type: 'DELETE', - url: ApiClient.getUrl('Social/Shares/' + shareId) - - }); - } - - function showMenu(userId, itemId) { - - Dashboard.showLoadingMsg(); - - require(['sharingwidget'], function (SharingWidget) { - - ApiClient.ajax({ - type: 'POST', - url: ApiClient.getUrl('Social/Shares', { - - ItemId: itemId, - UserId: userId - }), - dataType: "json" - - }).then(function (share) { - - var options = { - share: share - }; - - Dashboard.hideLoadingMsg(); - SharingWidget.showMenu(options, onSharingSuccess, onSharingCancel); - - }, function () { - - Dashboard.hideLoadingMsg(); - }); - }); - } - - window.SharingManager = { - showMenu: showMenu - }; - -}); \ No newline at end of file diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index 97722b31a1..e5fd1b0914 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -1651,12 +1651,12 @@ var AppInfo = {}; paths.hlsjs = bowerPath + "/hls.js/dist/hls.min"; if (Dashboard.isRunningInCordova()) { - paths.sharingwidget = "cordova/sharingwidget"; + paths.sharingMenu = "cordova/sharingwidget"; paths.serverdiscovery = "cordova/serverdiscovery"; paths.wakeonlan = "cordova/wakeonlan"; paths.actionsheet = "cordova/actionsheet"; } else { - paths.sharingwidget = "components/sharingwidget"; + paths.sharingMenu = "components/sharingwidget"; paths.serverdiscovery = apiClientBowerPath + "/serverdiscovery"; paths.wakeonlan = apiClientBowerPath + "/wakeonlan"; @@ -1678,6 +1678,8 @@ var AppInfo = {}; return viewManager; }); + define("sharingmanager", [embyWebComponentsBowerPath + "/sharing/sharingmanager"], returnFirstDependency); + // hack for an android test before browserInfo is loaded if (Dashboard.isRunningInCordova() && window.MainActivity) { paths.appStorage = "cordova/android/appstorage"; @@ -2028,8 +2030,6 @@ var AppInfo = {}; define("detailtablecss", ['css!css/detailtable.css']); define("tileitemcss", ['css!css/tileitem.css']); - define("sharingmanager", ["scripts/sharingmanager"]); - if (Dashboard.isRunningInCordova() && browserInfo.safari) { define("searchmenu", ["cordova/searchmenu"]); } else {