1.1.196

ITHitBuild · ITHitBuild · commit 6e738862e8b8 · 2019-03-25T23:39:07.000Z
diff --git a/FileSystem/MyCustomHandlerPage.html b/FileSystem/MyCustomHandlerPage.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+﻿<!DOCTYPE html>
 <html lang="en">
 <head>
     <title>IT Hit WebDAV Server Engine</title>
@@ -188,7 +188,7 @@ <h3>Client Version</h3>
 			EditDocAuth: {
 			    Authentication: 'anonymous',                       // Authentication to use when opening documents for editing: 'anonymous', 'challenge', 'ms-ofba', 'cookies'
                 CookieNames: null,                                 // Coma separated list of cookie names to search for.
-                SearchIn: null,                                    // Web browsers to search and copy permanent cookies from: 'current', 'none', 'all'.
+                SearchIn: null,                                    // Web browsers to search and copy permanent cookies from: 'current', 'none'.
                 LoginUrl: null                                     // Login URL to redirect to in case any cookies specified in CookieNames parameter are not found.
            }
         }
diff --git a/FileSystem/package.json b/FileSystem/package.json
@@ -1,6 +1,6 @@
 {
     "name":  "ithit.webdav.server.filesystem",
-    "version":  "1.1.195",
+    "version":  "1.1.196",
     "description":  "A cross-platform WebDAV Node.js server that runs on Windows, Mac OS X and Linux. This example is a fully-functional WebDAV server that can be used to open, edit and save Microsoft Office documents directly to server, without download/upload steps.",
     "author":  "IT Hit, Ltd",
     "license":  "IT Hit LTD.",
diff --git a/FileSystem/wwwroot/js/webdav-gridview.js b/FileSystem/wwwroot/js/webdav-gridview.js
@@ -1,4 +1,4 @@
-﻿﻿﻿
+﻿
 (function () {
     var Formatters = {
 
@@ -407,7 +407,7 @@
                 var className = 'ascending'
                 if ($(this).hasClass('ascending')) {
                     className = 'descending';
-                }            
+                }
 
                 oWebDAV.Sort($(this).data('sort-column'), className == 'ascending');
             })
@@ -448,7 +448,10 @@
         },
 
         _OnPopState: function (oEvent) {
-            if (!oWebDAV.GetHashValue('search')) {
+            if (oWebDAV.GetHashValue('search')) {
+                oSearchForm.LoadFromHash();
+            }
+            else {
                 var sUrl = oEvent.state && oEvent.state.Url || window.location.href.split("#")[0];
                 oWebDAV.NavigateFolder(sUrl);
             }
@@ -570,6 +573,11 @@
                 sPath = this.CurrentFolder.Href;
             }
 
+            //set upload url for uploader control
+            if (typeof WebDAVUploaderGridView !== 'undefined') {
+                WebDAVUploaderGridView.SetUploadUrl(sPath);
+            }
+
             if (sortColumn) {
                 this.CurrentSortColumn = sortColumn;
                 this.CurrentSortAscending = sortAscending;
@@ -681,13 +689,28 @@
                 this.SnippetPropertyName
             ];
 
-            this.CurrentFolder.GetSearchPageByQueryAsync(searchQuery, (currentPageNumber - 1) * pageSize, pageSize, function (oResult) {
-                /** @type {ITHit.WebDAV.Client.AsyncResult} oResult */
+            function _getSearchPageByQuery() {
+                oWebDAV.CurrentFolder.GetSearchPageByQueryAsync(searchQuery, (currentPageNumber - 1) * pageSize, pageSize, function (oResult) {
+                    /** @type {ITHit.WebDAV.Client.AsyncResult} oResult */
+
+                    /** @type {ITHit.WebDAV.Client.HierarchyItem[]} aItems */
+
+                    fCallback && fCallback(oResult);
+                });
+            }
+
+            if (window.location.href.split("#")[0] != this.CurrentFolder.Href) {
+                this.WebDavSession.OpenFolderAsync(window.location.href.split("#")[0], [], function (oResponse) {
+                    oWebDAV.CurrentFolder = oResponse.Result;
+                    oBreadcrumbs.SetHierarchyItem(oWebDAV.CurrentFolder);
+                    _getSearchPageByQuery();
+                });
+            }
+            else {
+                _getSearchPageByQuery();
+            }
 
-                /** @type {ITHit.WebDAV.Client.HierarchyItem[]} aItems */
 
-                fCallback && fCallback(oResult);
-            });
         },
 
         Sort: function (columnName, sortAscending) {
@@ -776,6 +799,7 @@
          * Sets values to hash       
          */
         SetHashValues: function (arrayValues) {
+            var hashValue = '';
             var params = [];
             var hashConfig = this._parseUrlHash();
 
@@ -787,7 +811,11 @@
                 params.push(key + '=' + hashConfig[key]);
             }
 
-            location.hash = params.length > 0 ? ('#' + params.join('&')) : '';
+            hashValue = params.length > 0 ? ('#' + params.join('&')) : '';
+
+            if (hashValue != location.hash) {
+                location.hash = hashValue;
+            }
 
             if (location.href[location.href.length - 1] == '#') {
                 oHistoryApi.PushState();
@@ -801,12 +829,19 @@
             this.SetHashValues([{ Name: name, Value: value }]);
         },
 
+        /**
+         * Returns url of app installer
+         */
+        GetInstallerFileUrl: function () {
+            return webDavSettings.ApplicationProtocolsPath + ITHit.WebDAV.Client.DocManager.GetInstallFileName();
+        },
+
         /**
          * Adds name and value to array
          * @return {Array}
          */
         _addParameterToArray: function (name, value, arrayParams) {
-            var nameExist = false;        
+            var nameExist = false;
 
             for (var key in arrayParams) {
                 if (arrayParams.hasOwnProperty(key)) {
@@ -851,6 +886,8 @@
          * @private
          */
         _ProtocolInstallMessage: function () {
+            var installerFilePath = this.GetInstallerFileUrl();
+
             if (ITHit.WebDAV.Client.DocManager.IsDavProtocolSupported()) {
                 oConfirmModal.Confirm('This action requires a protocol installation. <br/><br/>' +
                     'Make sure a web browser extension is enabled after protocol installation.<br/>' +
@@ -860,9 +897,9 @@
                     'Select OK to download the protocol installer.', function () {
                         // IT Hit WebDAV Ajax Library protocol installers path.
                         // Used to open non-MS Office documents or if MS Office is
-                        // not installed as well as to open OS File Manager.      
+                        // not installed as well as to open OS File Manager.     
+
 
-                        var installerFilePath = webDavSettings.ApplicationProtocolsPath + ITHit.WebDAV.Client.DocManager.GetInstallFileName();
                         window.open(installerFilePath);
                     }, { size: 'lg' });
             }
@@ -888,7 +925,7 @@
         oWebDAV.NavigateFolder(window.location.href.split("#")[0]);
     }
 
-        // Set Ajax lib version
+    // Set Ajax lib version
     if (ITHit.WebDAV.Client.DocManager.IsDavProtocolSupported()) {
         var $installerLink = $('<a></a>')
             .attr('href', webDavSettings.ApplicationProtocolsPath + ITHit.WebDAV.Client.DocManager.GetInstallFileName())
@@ -897,8 +934,6 @@
     } else {
         $('.ithit-version-value').text('v' + ITHit.WebDAV.Client.WebDavSession.Version + ' (Protocol v' + ITHit.WebDAV.Client.WebDavSession.ProtocolVersion + ')');
     }
-
-
     $('.ithit-current-folder-value').text(oWebDAV.GetMountUrl());
 
 })();
diff --git a/FileSystem/wwwroot/js/webdav-uploader.js b/FileSystem/wwwroot/js/webdav-uploader.js
@@ -1,4 +1,4 @@
-﻿﻿﻿
+﻿
 (function () {
     ///////////////////
     // Confirm Bootstrap Modal
@@ -85,7 +85,7 @@
             $(input.HtmlElement).trigger('click');
         });
 
-        this.Uploader.SetUploadUrl(ITHit.WebDAV.Client.Encoder.Decode(window.location.href.split("#")[0]));
+        this.SetUploadUrl(ITHit.WebDAV.Client.Encoder.Decode(window.location.href.split("#")[0]));
         this.Uploader.Queue.AddListener('OnQueueChanged', '_QueueChange', this);
         this.Uploader.Queue.OnUploadItemsCreatedCallback = this._OnUploadItemsCreatedCallback.bind(this);
         var $table = this.$table = $(sSelector);
@@ -105,6 +105,10 @@
         });
     };
 
+    UploaderGridView.prototype.SetUploadUrl = function (url) {
+        this.Uploader.SetUploadUrl(url);
+    };
+
     UploaderGridView.prototype._OnUploadItemsCreatedCallback = function (oUploadItemsCreated) {
         this._GetExistsAsync(oUploadItemsCreated.Items, function (oAsyncResult) {
             if (oAsyncResult.IsSuccess && oAsyncResult.Result.length) {
@@ -463,5 +467,5 @@
     };
 
     var oConfirmModal = new ConfirmModal('#ConfirmModal');
-    var oUploaderGrid = new UploaderGridView('.ithit-grid-uploads');
+    window.WebDAVUploaderGridView = new UploaderGridView('.ithit-grid-uploads');
 })();

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<!DOCTYPE html>`
	`1`	`+<!DOCTYPE html>`
`2`	`2`	`<html lang="en">`
`3`	`3`	`<head>`
`4`	`4`	`<title>IT Hit WebDAV Server Engine</title>`
`@@ -188,7 +188,7 @@ <h3>Client Version</h3>`
`188`	`188`	`EditDocAuth: {`
`189`	`189`	`Authentication: 'anonymous', // Authentication to use when opening documents for editing: 'anonymous', 'challenge', 'ms-ofba', 'cookies'`
`190`	`190`	`CookieNames: null, // Coma separated list of cookie names to search for.`
`191`		`- SearchIn: null, // Web browsers to search and copy permanent cookies from: 'current', 'none', 'all'.`
	`191`	`+ SearchIn: null, // Web browsers to search and copy permanent cookies from: 'current', 'none'.`
`192`	`192`	`LoginUrl: null // Login URL to redirect to in case any cookies specified in CookieNames parameter are not found.`
`193`	`193`	`}`
`194`	`194`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "ithit.webdav.server.filesystem",`
`3`		`- "version": "1.1.195",`
	`3`	`+ "version": "1.1.196",`
`4`	`4`	`"description": "A cross-platform WebDAV Node.js server that runs on Windows, Mac OS X and Linux. This example is a fully-functional WebDAV server that can be used to open, edit and save Microsoft Office documents directly to server, without download/upload steps.",`
`5`	`5`	`"author": "IT Hit, Ltd",`
`6`	`6`	`"license": "IT Hit LTD.",`