Remove '-input' string because we append that in _editControl & correct all getElementById which uses the Input element

- Because we have appended '-input' to add ui-edit-control in jsDialog builder filer
- now we do not need any id/string which have '-input' at very end of that element

- for some cases we need correct GetElement by ID in js files

Signed-off-by: Darshan-upadhyay1110 <darshan.upadhyay@collabora.com>
Change-Id: Id9b4f53e8deaa2f26c6abc93dc80504895107bd0

8 files changed, 15 insertions, 15 deletions

diff --git a/browser/src/control/Control.FormulaBarJSDialog.js b/browser/src/control/Control.FormulaBarJSDialog.js
index c8dcc6e911..0ad7ff13c5 100644
--- a/browser/src/control/Control.FormulaBarJSDialog.js
+++ b/browser/src/control/Control.FormulaBarJSDialog.js
@@ -56,7 +56,7 @@ class FormulaBar {
 	}
 
 	onUpdatePermission(e) {
-		var adressInput = L.DomUtil.get('addressInput');
+		var adressInput = L.DomUtil.get('addressInput-input');
 
 		if (e.perm === 'edit') {
 			if (adressInput)
@@ -70,7 +70,7 @@ class FormulaBar {
 	}
 
 	onCellAddress (e) {
-		var adressInput = L.DomUtil.get('addressInput');
+		var adressInput = L.DomUtil.get('addressInput-input');
 		if (adressInput && document.activeElement !== adressInput) {
 			// if the user is not editing the address field
 			adressInput.value = e.address;
@@ -80,9 +80,9 @@ class FormulaBar {
 
 	onAddressInputChange() {
 		// address control should not have focus anymore
-		L.DomUtil.get('addressInput').blur();
+		L.DomUtil.get('addressInput-input').blur();
 		this.map.focus();
-		var value = L.DomUtil.get('addressInput').value;
+		var value = L.DomUtil.get('addressInput-input').value;
 		var command = {
 			ToPoint : {
 				type: 'string',
diff --git a/browser/src/control/Control.MobileSearchBar.ts b/browser/src/control/Control.MobileSearchBar.ts
index d691d9b978..d0398548d2 100644
--- a/browser/src/control/Control.MobileSearchBar.ts
+++ b/browser/src/control/Control.MobileSearchBar.ts
@@ -26,7 +26,7 @@ class MobileSearchBar extends Toolbar {
 				w2icon: 'unfold',
 				text: _('Hide the search bar'),
 			},
-			{ type: 'edit', id: 'search-input', placeholder: _('Search'), text: '' },
+			{ type: 'edit', id: 'search', placeholder: _('Search'), text: '' },
 			{
 				type: 'customtoolitem',
 				id: 'searchprev',
diff --git a/browser/src/control/Control.StatusBar.js b/browser/src/control/Control.StatusBar.js
index 2cd327fbd3..7e51835751 100644
--- a/browser/src/control/Control.StatusBar.js
+++ b/browser/src/control/Control.StatusBar.js
@@ -222,7 +222,7 @@ class StatusBar extends JSDialog.Toolbar {
 
 	getToolItems() {
 		return [
-			{type: 'edit',  id: 'search-input', placeholder: _('Search'), text: ''},
+			{type: 'edit',  id: 'search', placeholder: _('Search'), text: ''},
 			{type: 'customtoolitem',  id: 'searchprev', command: 'searchprev', text: _UNO('.uno:UpSearch'), enabled: false},
 			{type: 'customtoolitem',  id: 'searchnext', command: 'searchnext', text: _UNO('.uno:DownSearch'), enabled: false},
 			{type: 'customtoolitem',  id: 'cancelsearch', command: 'cancelsearch', text: _('Cancel the search'), visible: false},
diff --git a/browser/src/control/Control.Toolbar.js b/browser/src/control/Control.Toolbar.js
index 475055d151..64bc95e6a2 100644
--- a/browser/src/control/Control.Toolbar.js
+++ b/browser/src/control/Control.Toolbar.js
@@ -730,7 +730,7 @@ function onInsertBackground() {
 
 function onWopiProps(e) {
 	if (e.DisableCopy) {
-		$('input#addressInput').bind('copy', function(evt) {
+		$('input#addressInput-input').bind('copy', function(evt) {
 			evt.preventDefault();
 		});
 	}
diff --git a/browser/src/control/Control.UIManager.js b/browser/src/control/Control.UIManager.js
index 99e43c2b1c..0f25f0a072 100644
--- a/browser/src/control/Control.UIManager.js
+++ b/browser/src/control/Control.UIManager.js
@@ -1469,10 +1469,10 @@ L.Control.UIManager = L.Control.extend({
 				id: 'info-modal-label1',
 				type: 'fixedtext',
 				text: message,
-				labelFor: 'input-modal-input',
+				labelFor: 'input-modal',
 			},
 			{
-				id: 'input-modal-input',
+				id: 'input-modal',
 				type: 'edit',
 				password: !!passwordInput,
 				text: defaultValue,
diff --git a/browser/src/control/Toolbar.js b/browser/src/control/Toolbar.js
index cd4cffb97b..f0438e4484 100644
--- a/browser/src/control/Toolbar.js
+++ b/browser/src/control/Toolbar.js
@@ -952,7 +952,7 @@ L.Map.include({
 		map.uiManager.showModal(json, [
 			{id: 'response-ok', func: function() {
 				var text = document.getElementById('hyperlink-text-box');
-				var link = document.getElementById('hyperlink-link-box');
+				var link = document.getElementById('hyperlink-link-box-input');
 
 				if (link.value != '') {
 					if (!text.value || text.value === '')
@@ -1113,7 +1113,7 @@ L.Map.include({
 		}, 250);
 
 		map.formulabar.blurField();
-		$('#addressInput').blur();
+		$('#addressInput-input').blur();
 	},
 
 	formulabarBlur: function() {
diff --git a/browser/src/docdispatcher.ts b/browser/src/docdispatcher.ts
index 8591fcb780..e37e4d0fff 100644
--- a/browser/src/docdispatcher.ts
+++ b/browser/src/docdispatcher.ts
@@ -303,7 +303,7 @@ class Dispatcher {
 			app.map.sendUnoCommand('.uno:ToggleRelative');
 		};
 		this.actionsMap['focusonaddressinput'] = function () {
-			document.getElementById('addressInput').focus();
+			document.getElementById('addressInput-input').focus();
 		};
 
 		// sheets toolbar
diff --git a/browser/src/layer/tile/CanvasTileLayer.js b/browser/src/layer/tile/CanvasTileLayer.js
index b3aeafd64c..e67d85a008 100644
--- a/browser/src/layer/tile/CanvasTileLayer.js
+++ b/browser/src/layer/tile/CanvasTileLayer.js
@@ -3416,7 +3416,7 @@ L.CanvasTileLayer = L.Layer.extend({
 
 	_isWholeColumnSelected: function (cellAddress) {
 		if (!cellAddress)
-			cellAddress = document.getElementById('addressInput').value;
+			cellAddress = document.getElementById('addressInput-input').value;
 
 		var startEnd = cellAddress.split(':');
 		if (startEnd.length === 1)
@@ -3435,7 +3435,7 @@ L.CanvasTileLayer = L.Layer.extend({
 
 	_isWholeRowSelected: function (cellAddress) {
 		if (!cellAddress)
-			cellAddress = document.getElementById('addressInput').value;
+			cellAddress = document.getElementById('addressInput-input').value;
 
 		var startEnd = cellAddress.split(':');
 		if (startEnd.length === 1)
@@ -3491,7 +3491,7 @@ L.CanvasTileLayer = L.Layer.extend({
 					newCenter.pX += scrollX;
 					newCenter.pY += scrollY;
 					if (!this._map.wholeColumnSelected && !this._map.wholeRowSelected) {
-						var address = document.getElementById('addressInput').value;
+						var address = document.getElementById('addressInput-input').value;
 						if (!this._isWholeColumnSelected(address) && !this._isWholeRowSelected(address))
 							this.scrollToPos(newCenter);
 					}