From 043ee569cac75cb51cee4860d4109a1edec76b33 Mon Sep 17 00:00:00 2001 From: Sarmishta Velury Date: Tue, 29 Mar 2022 10:53:31 -0400 Subject: [PATCH 1/2] User check now works properly for files with spaces in the name --- git-webui/release/share/git-webui/webui/js/git-webui.js | 8 +++++++- git-webui/src/share/git-webui/webui/js/git-webui.js | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/git-webui/release/share/git-webui/webui/js/git-webui.js b/git-webui/release/share/git-webui/webui/js/git-webui.js index 8b7d332d..99fda7ed 100644 --- a/git-webui/release/share/git-webui/webui/js/git-webui.js +++ b/git-webui/release/share/git-webui/webui/js/git-webui.js @@ -2090,7 +2090,13 @@ webui.ChangedFilesView = function(workspaceView, type, label) { } else { model = line; } - var isForCurrentUser = (uncommittedItems.indexOf(model) > -1); + var isForCurrentUser; + if(model.indexOf(" ") > -1){ + model = model.substring(1, model.length-1) + isForCurrentUser = (uncommittedItems.indexOf(model) > -1); + } else { + isForCurrentUser = (uncommittedItems.indexOf(model) > -1); + } var cssClass = isForCurrentUser ? 'list-group-item available' : 'list-group-item unavailable'; if(isForCurrentUser){ diff --git a/git-webui/src/share/git-webui/webui/js/git-webui.js b/git-webui/src/share/git-webui/webui/js/git-webui.js index 8b7d332d..99fda7ed 100644 --- a/git-webui/src/share/git-webui/webui/js/git-webui.js +++ b/git-webui/src/share/git-webui/webui/js/git-webui.js @@ -2090,7 +2090,13 @@ webui.ChangedFilesView = function(workspaceView, type, label) { } else { model = line; } - var isForCurrentUser = (uncommittedItems.indexOf(model) > -1); + var isForCurrentUser; + if(model.indexOf(" ") > -1){ + model = model.substring(1, model.length-1) + isForCurrentUser = (uncommittedItems.indexOf(model) > -1); + } else { + isForCurrentUser = (uncommittedItems.indexOf(model) > -1); + } var cssClass = isForCurrentUser ? 'list-group-item available' : 'list-group-item unavailable'; if(isForCurrentUser){ From a239d9b1da41b605b181cdb5189cc25c40e64f96 Mon Sep 17 00:00:00 2001 From: Sarmishta Velury Date: Mon, 4 Apr 2022 12:00:18 -0400 Subject: [PATCH 2/2] All workspace operations now work with filenames with spaces in them. --- .../share/git-webui/webui/js/git-webui.js | 19 ++++++++++++++----- .../src/share/git-webui/webui/js/git-webui.js | 19 ++++++++++++++----- 2 files changed, 28 insertions(+), 10 deletions(-) diff --git a/git-webui/release/share/git-webui/webui/js/git-webui.js b/git-webui/release/share/git-webui/webui/js/git-webui.js index 99fda7ed..6e588a5b 100644 --- a/git-webui/release/share/git-webui/webui/js/git-webui.js +++ b/git-webui/release/share/git-webui/webui/js/git-webui.js @@ -405,7 +405,12 @@ webui.SideBarView = function(mainView, noEventHandlers) { } else { model = line; } - var isForCurrentUser = (uncommittedItems.indexOf(model) > -1); + var isForCurrentUser; + if(model.indexOf(" ") > -1){ + isForCurrentUser = (uncommittedItems.indexOf(model.substring(1, model.length-1)) > -1); + } else { + isForCurrentUser = (uncommittedItems.indexOf(model) > -1); + } if(!isForCurrentUser) { flag = 1; } @@ -478,7 +483,12 @@ webui.SideBarView = function(mainView, noEventHandlers) { } else { model = line; } - var isForCurrentUser = (uncommittedItems.indexOf(model) > -1); + var isForCurrentUser; + if(model.indexOf(" ") > -1){ + isForCurrentUser = (uncommittedItems.indexOf(model.substring(1, model.length-1)) > -1); + } else { + isForCurrentUser = (uncommittedItems.indexOf(model) > -1); + } if(!isForCurrentUser) { flag = 1; } @@ -2092,8 +2102,7 @@ webui.ChangedFilesView = function(workspaceView, type, label) { } var isForCurrentUser; if(model.indexOf(" ") > -1){ - model = model.substring(1, model.length-1) - isForCurrentUser = (uncommittedItems.indexOf(model) > -1); + isForCurrentUser = (uncommittedItems.indexOf(model.substring(1, model.length-1)) > -1); } else { isForCurrentUser = (uncommittedItems.indexOf(model) > -1); } @@ -2265,7 +2274,7 @@ webui.ChangedFilesView = function(workspaceView, type, label) { var excluded = excluding != undefined && excluding.indexOf(child.status) != -1; if ($(child).hasClass("active") && ($(child).hasClass("available")^onlyUnavailable) && included && !excluded) { if(stringifyFilenames) - files += '"' + (child.model) + '" '; + files += ((child.model) + ' '); else files.push(child); } diff --git a/git-webui/src/share/git-webui/webui/js/git-webui.js b/git-webui/src/share/git-webui/webui/js/git-webui.js index 99fda7ed..6e588a5b 100644 --- a/git-webui/src/share/git-webui/webui/js/git-webui.js +++ b/git-webui/src/share/git-webui/webui/js/git-webui.js @@ -405,7 +405,12 @@ webui.SideBarView = function(mainView, noEventHandlers) { } else { model = line; } - var isForCurrentUser = (uncommittedItems.indexOf(model) > -1); + var isForCurrentUser; + if(model.indexOf(" ") > -1){ + isForCurrentUser = (uncommittedItems.indexOf(model.substring(1, model.length-1)) > -1); + } else { + isForCurrentUser = (uncommittedItems.indexOf(model) > -1); + } if(!isForCurrentUser) { flag = 1; } @@ -478,7 +483,12 @@ webui.SideBarView = function(mainView, noEventHandlers) { } else { model = line; } - var isForCurrentUser = (uncommittedItems.indexOf(model) > -1); + var isForCurrentUser; + if(model.indexOf(" ") > -1){ + isForCurrentUser = (uncommittedItems.indexOf(model.substring(1, model.length-1)) > -1); + } else { + isForCurrentUser = (uncommittedItems.indexOf(model) > -1); + } if(!isForCurrentUser) { flag = 1; } @@ -2092,8 +2102,7 @@ webui.ChangedFilesView = function(workspaceView, type, label) { } var isForCurrentUser; if(model.indexOf(" ") > -1){ - model = model.substring(1, model.length-1) - isForCurrentUser = (uncommittedItems.indexOf(model) > -1); + isForCurrentUser = (uncommittedItems.indexOf(model.substring(1, model.length-1)) > -1); } else { isForCurrentUser = (uncommittedItems.indexOf(model) > -1); } @@ -2265,7 +2274,7 @@ webui.ChangedFilesView = function(workspaceView, type, label) { var excluded = excluding != undefined && excluding.indexOf(child.status) != -1; if ($(child).hasClass("active") && ($(child).hasClass("available")^onlyUnavailable) && included && !excluded) { if(stringifyFilenames) - files += '"' + (child.model) + '" '; + files += ((child.model) + ' '); else files.push(child); }