update local sync

dashboard-ui/bower_components/emby-apiclient/apiclient.js

@@ -3361,6 +3361,29 @@
             });
         };
 
+        self.cancelSyncItems = function (itemIds, targetId) {
+
+            if (!userId) {
+                throw new Error("null userId");
+            }
+
+            if (!itemId) {
+                throw new Error("null itemId");
+            }
+
+            var url = self.getUrl("Sync/Items/Cancel");
+
+            return self.ajax({
+                type: "POST",
+                data: JSON.stringify({
+                    TargetId: targetId || self.deviceId(),
+                    ItemIds: itemIds
+                }),
+                contentType: "application/json",
+                url: url
+            });
+        };
+
         /**
          * Reports a user has stopped playing an item
          * @param {String} userId

dashboard-ui/components/navdrawer/navdrawer.js

@@ -97,7 +97,10 @@
                 return;
             }
 
-            var edgeHammer = new Hammer(options.edgeSwipeElement, null);
+            require(['hammer-main'], initEdgeSwipeInternal);
+        }
+
+        function initEdgeSwipeInternal(edgeHammer) {
             var isPeeking = false;
 
             edgeHammer.on('panstart panmove', function (ev) {

dashboard-ui/itemdetails.html

@@ -38,7 +38,7 @@
                 <div class="syncLocalContainer hide" style="margin-top:1em; display: inline-flex; padding: 0 .5em;">
                     <label class="checkboxContainer" style="margin:0;">
                         <input type="checkbox" is="emby-checkbox" class="chkOffline" />
-                        <span>Make Available Offline</span>
+                        <span>${MakeAvailableOffline}</span>
                     </label>
                 </div>
             </div>
@@ -62,7 +62,7 @@
         <div class="syncLocalContainer hide" style="margin-top:1em; display: inline-flex; padding: 0 .5em;">
             <label class="checkboxContainer" style="margin:0;">
                 <input type="checkbox" is="emby-checkbox" class="chkOffline" />
-                <span>Make Available Offline</span>
+                <span>${MakeAvailableOffline}</span>
             </label>
         </div>
     </div>

dashboard-ui/scripts/itemdetailpage.js

@@ -2054,21 +2054,30 @@
         });
     }
 
-    function onSyncLocalClick() {
-
-        if (this.checked) {
-            require(['syncDialog'], function (syncDialog) {
-                syncDialog.showMenu({
-                    items: [currentItem]
-                });
-            });
-        } else {
-
-        }
-    }
-
     return function (view, params) {
 
+        function onSyncLocalClick() {
+
+            if (this.checked) {
+                require(['syncDialog'], function (syncDialog) {
+                    syncDialog.showMenu({
+                        items: [currentItem]
+                    });
+                });
+            } else {
+
+                require(['confirm'], function (confirm) {
+
+                    confirm(Globalize.translate('ConfirmRemoveDownload')).then(function () {
+                        ApiClient.cancelSyncItems([currentItem.Id]);
+                    }, function () {
+
+                        updateSyncStatus(view, currentItem);
+                    });
+                });
+            }
+        }
+
         function onPlayTrailerClick() {
             playTrailer(view);
         }

dashboard-ui/scripts/librarybrowser.js

@@ -116,32 +116,43 @@
             configureSwipeTabs: function (ownerpage, tabs) {
 
                 if (!browser.touch) {
-                    return;
+                    //return;
                 }
 
+                //require(['hammer'], function (Hammer) {
+
+                //    var hammertime = new Hammer(ownerpage);
+                //    hammertime.get('swipe').set({ direction: Hammer.DIRECTION_HORIZONTAL });
+
+                //});
+
                 var pageCount = ownerpage.querySelectorAll('.pageTabContent').length;
-
+                var onSwipeLeft = function (e) {
-                require(['hammer'], function (Hammer) {
+                    if (LibraryBrowser.allowSwipe(e.target) && ownerpage.contains(e.target)) {
-
+                        var selected = parseInt(tabs.selectedIndex() || '0');
-                    var hammertime = new Hammer(ownerpage);
+                        if (selected < (pageCount - 1)) {
-                    hammertime.get('swipe').set({ direction: Hammer.DIRECTION_HORIZONTAL });
+                            tabs.selectedIndex(selected + 1);
-
-                    hammertime.on('swipeleft', function (e) {
-                        if (LibraryBrowser.allowSwipe(e.target)) {
-                            var selected = parseInt(tabs.selectedIndex() || '0');
-                            if (selected < (pageCount - 1)) {
-                                tabs.selectedIndex(selected + 1);
-                            }
                         }
-                    });
+                    }
+                };
 
-                    hammertime.on('swiperight', function (e) {
+                var onSwipeRight = function (e) {
-                        if (LibraryBrowser.allowSwipe(e.target)) {
+                    if (LibraryBrowser.allowSwipe(e.target) && ownerpage.contains(e.target)) {
-                            var selected = parseInt(tabs.selectedIndex() || '0');
+                        var selected = parseInt(tabs.selectedIndex() || '0');
-                            if (selected > 0) {
+                        if (selected > 0) {
-                                tabs.selectedIndex(selected - 1);
+                            tabs.selectedIndex(selected - 1);
-                            }
                         }
+                    }
+                };
+
+                require(['hammer-main'], function (hammertime) {
+                    
+                    hammertime.on('swipeleft', onSwipeLeft);
+                    hammertime.on('swiperight', onSwipeRight);
+
+                    ownerpage.addEventListener('viewdestroy', function () {
+                        hammertime.off('swipeleft', onSwipeLeft);
+                        hammertime.off('swiperight', onSwipeRight);
                     });
                 });
             },

dashboard-ui/scripts/librarymenu.js

@@ -1055,8 +1055,7 @@
             target: navDrawerElement,
             onChange: onMainDrawerSelect,
             width: drawerWidth,
-            disableEdgeSwipe: disableEdgeSwipe,
+            disableEdgeSwipe: disableEdgeSwipe
-            edgeSwipeElement: document.querySelector('.mainDrawerPanelContent')
         };
     }
 

dashboard-ui/scripts/site.js

@@ -1204,6 +1204,12 @@ var AppInfo = {};
         return headroom;
     }
 
+    function createMainContentHammer(Hammer) {
+        
+        var hammer = new Hammer(document.querySelector('.mainDrawerPanelContent'), null);
+        return hammer;
+    }
+
     function initRequire() {
 
         var urlArgs = "v=" + (window.dashboardVersion || new Date().getDate());
@@ -1511,6 +1517,7 @@ var AppInfo = {};
         });
 
         define("headroom-window", ['headroom'], createWindowHeadroom);
+        define("hammer-main", ['hammer'], createMainContentHammer);
 
         // mock this for now. not used in this app
         define("playbackManager", [], function () {

dashboard-ui/strings/en-US.json

@@ -2312,5 +2312,7 @@
   "MoreFromValue": "More from {0}",
   "OptionSaveMetadataAsHiddenHelp": "Changing this will apply to new metadata saved going forward. Existing metadata files will be updated the next time they are saved by Emby Server.",
   "EnablePhotos": "Enable photos",
-  "EnablePhotosHelp": "Photos will be detected and displayed alongside other media files."
+  "EnablePhotosHelp": "Photos will be detected and displayed alongside other media files.",
+  "MakeAvailableOffline": "Make available offline",
+  "ConfirmRemoveDownload": "Remove download?"
 }