Merge branch 'feature/v2' into issue/llaske#1551

hharshas · Mar 14, 2024 · 35baaef · 35baaef
2 parents 3de30ce + dae27b1
commit 35baaef
Show file tree

Hide file tree

Showing 18 changed files with 236 additions and 14,879 deletions.
diff --git a/v2/js/components/SugarL10n.js b/v2/js/components/SugarL10n.js
@@ -33,7 +33,6 @@ const SugarL10n = {
 
 		const language = vm.language.split('-')[0];
 		vm.loadLanguageFile(language)
-		console.log('Language: ' + language);	
 	},
 
 	methods: {

diff --git a/v2/js/components/dialog.js b/v2/js/components/dialog.js
@@ -20,7 +20,7 @@
 				<div class="dialog-content">
 					<div class="toolbar">
 						<div v-if="iconData" class="module-icon">
-							<icon id="37" :svgfile="this.iconData" :isNative="this.isNative" :color="iconColorData ? iconColorData : 256" x="4" y="4" :size="constant.sizeToolbar"
+							<icon id="37" :svgfile="this.iconData" :isNative="this.isNative" :color="iconColorData ? iconColorData : 256" :x="4" :y="4" :size="constant.sizeToolbar"
 						></icon></div>
 						<div v-if="titleData" class="module-text">{{titleData}}</div>
 						<search-field class="settings-filter-text"

diff --git a/v2/js/components/icon.js b/v2/js/components/icon.js
@@ -25,7 +25,7 @@ const Icon ={
 		disableHoverEffect ? '' : 'icon',
 		].join(' ')" ref="icon" v-html="gensvg" :id="this.idData"></div>`,
 	props: {
-		id: Number,
+		id: String,
 		svgfile: String,
 		color: Number,
 		size: Number,

diff --git a/v2/js/components/iconbutton.js b/v2/js/components/iconbutton.js
@@ -36,10 +36,10 @@ const IconButton ={
 		id: String,
 		svgfile: String,
 		isNative: String,
-		color: String,
-		size: String,
-		x: String,
-		y: String,
+		color: Number,
+		size: Number,
+		x: Number,
+		y: Number,
 		disabled: Boolean,
 	},
 	components: {

diff --git a/v2/js/components/popup.js b/v2/js/components/popup.js
@@ -6,7 +6,7 @@
  * @vue-data {Boolean} [isShown=false] - to ensure if popup instance is currently visible in DOM
  * @vue-data {Number} [xData=null] - left position of popup component
  * @vue-data {Number} [yData=null] - top position of popup component
- * @vue-event {String} itemisClicked - Emit selected item when clicked in "'popup component id'_'selected item name'" format
+ * @vue-event {String} itemisClicked - Emit selected item when clicked in "'popup component id'_'selected item id'" format
  */
 const Popup ={
 	name: 'Popup',

diff --git a/v2/js/screens/settings-aboutme.js b/v2/js/screens/settings-aboutme.js
@@ -29,9 +29,9 @@ const AboutMe = {
 									id="warning-icon"
 									svgfile="./icons/emblem-warning.svg"
 									:size="constant.sizeWarning"
-									color="256"
-									x="0"
-									y="0"
+									:color="256"
+									:x="0"
+									:y="0"
 									isNative="true"
 								></icon>
 								<span id="warning_text">{{ warning.text }}</span>

diff --git a/v2/js/screens/settings-aboutmyserver.js b/v2/js/screens/settings-aboutmyserver.js
@@ -48,10 +48,10 @@ const AboutMyServer = {
 							<icon 
 								id="privacy-icon"
 								svgfile="./icons/cookie.svg"
-								size="55"
-								color="256"
-								x="0"
-								y="0"
+								:size="55"
+								:color="256"
+								:x="0"
+								:y="0"
 								isNative="true"
 							></icon>
 							<div class="aboutserver-policytext" id="loginscreen_cookietext" v-html="SugarL10n ? SugarL10n.get('CookieConsent') : ''"></div>
@@ -63,10 +63,10 @@ const AboutMyServer = {
 								id="next-btn"
 								svgfile="./icons/go-right.svg"
 								class="ls_icon_btn"
-								size="28"
-								color="1024"
-								x="0"
-								y="0"
+								:size="28"
+								:color="1024"
+								:x="0"
+								:y="0"
 								:text="SugarL10n ? SugarL10n.get('Next') : ''"
 								@click="nextStep"
 							></icon-button>

diff --git a/v2/js/screens/settings-myprivacy.js b/v2/js/screens/settings-myprivacy.js
@@ -22,17 +22,17 @@ const MyPrivacy = {
 								id="myprivacy-cancel-btn"
 								class="warningbox-cancel-button"
 								svgfile="icons/dialog-cancel.svg"
-								size="20"
-								color="1024"
+								:size="20"
+								:color="1024"
 								:text="SugarL10n ? SugarL10n.get('CancelChanges') : ''"
 								@click="close('privacy')"
 							></icon-button>								
 							<icon-button
 								id="myprivacy-restar-btn"
 								class="warningbox-refresh-button"
 								svgfile="icons/system-restart.svg"
-								size="20"
-								color="1024"
+								:size="20"
+								:color="1024"
 								:text="SugarL10n ? SugarL10n.get('RestartNow') : ''"
 								@click="deleteAccount"
 							></icon-button>
@@ -51,8 +51,8 @@ const MyPrivacy = {
 								id="myprivacy-delete-local-btn"
 								svgfile="icons/module-about_my_computer.svg"
 								isNative="true"
-								size="28"
-								color="256"
+								:size="28"
+								:color="256"
 								:text="SugarL10n ? SugarL10n.get('PrivacyRemoveLocal') : ''"
 								@click="showWarning('local')"
 							></icon-button>
@@ -62,8 +62,8 @@ const MyPrivacy = {
 								id="myprivacy-delete-remote-btn"
 								svgfile="icons/cloud-settings.svg"
 								isNative="true"
-								size="28"
-								color="256"
+								:size="28"
+								:color="256"
 								:text="SugarL10n ? SugarL10n.get('PrivacyRemoveRemote') : ''"
 								@click="showWarning('remote')"
 							></icon-button>

diff --git a/v2/js/screens/settings-mysecurity.js b/v2/js/screens/settings-mysecurity.js
@@ -20,10 +20,10 @@ const MySecurity = {
 								id="next-btn"
 								svgfile="./icons/go-right.svg"
 								class="security-rightbutton"
-								size="28"
-								color="1024"
-								x="0"
-								y="0"
+								:size="28"
+								:color="1024"
+								:x="0"
+								:y="0"
 								:text="SugarL10n ? SugarL10n.get('Next') : ''"
 								@click="login"
 							></icon-button>
@@ -38,10 +38,10 @@ const MySecurity = {
 								id="next-btn"
 								svgfile="./icons/go-right.svg"
 								class="security-rightbutton"
-								size="28"
-								color="1024"
-								x="0"
-								y="0"
+								:size="28"
+								:color="1024"
+								:x="0"
+								:y="0"
 								:text="SugarL10n ? SugarL10n.get('Done') : ''"
 								@click="updatePassword"
 							></icon-button>

diff --git a/v2/js/screens/settings.js b/v2/js/screens/settings.js
@@ -22,31 +22,31 @@ const Settings = {
 							</div>
 							<div v-bind:class="(filtersettings.find(v => (localizedL10n.stringAboutMyComputer).includes(v))) ? '' :'dialog-item-disable'">
 								<div v-on:click="openModal('about_my_computer')">
-									<icon id="32" svgfile="icons/module-about_my_computer.svg" color="256" :size="constant.sizeSettings" is-native="true" @click="openModal('about_my_computer')"
+									<icon id="32" svgfile="icons/module-about_my_computer.svg" :color="256" :size="constant.sizeSettings" is-native="true" @click="openModal('about_my_computer')"
 								></icon></div>
 								<div class="dialog-item-text">{{localizedL10n.stringAboutMyComputer}}</div>
 							</div>
 							<div v-bind:class="(filtersettings.find(v => (localizedL10n.stringServer).includes(v))) ? '' :'dialog-item-disable'">
 								<div >
-									<icon id="33" svgfile="icons/cloud-settings.svg" color="256" :size="constant.sizeSettings" is-native="true" @click="openModal('about_my_server')"
+									<icon id="33" svgfile="icons/cloud-settings.svg" :color="256" :size="constant.sizeSettings" is-native="true" @click="openModal('about_my_server')"
 								></icon></div>
 								<div class="dialog-item-text">{{localizedL10n.stringServer}}</div>
 							</div>
 							<div v-bind:class="(filtersettings.find(v => (localizedL10n.stringMySecurity).includes(v))) ? '' :'dialog-item-disable'" v-if="connected">
 								<div >
-									<icon id="34" svgfile="icons/login-icon.svg" color="256" :size="constant.sizeSettings" is-native="true" @click="openModal('security')"
+									<icon id="34" svgfile="icons/login-icon.svg" :color="256" :size="constant.sizeSettings" is-native="true" @click="openModal('security')"
 								></icon></div>
 								<div class="dialog-item-text">{{localizedL10n.stringMySecurity}}</div>
 							</div>
 							<div v-bind:class="(filtersettings.find(v => (localizedL10n.stringMyPrivacy).includes(v))) ? '' :'dialog-item-disable'">
 								<div >
-									<icon id="35" svgfile="icons/privacy.svg" color="256" :size="constant.sizeSettings" is-native="true" @click="openModal('privacy')"
+									<icon id="35" svgfile="icons/privacy.svg" :color="256" :size="constant.sizeSettings" is-native="true" @click="openModal('privacy')"
 								></icon></div>
 								<div class="dialog-item-text">{{localizedL10n.stringMyPrivacy}}</div>
 							</div>
 							<div v-bind:class="(filtersettings.find(v => (localizedL10n.stringLanguage).includes(v))) ? '' :'dialog-item-disable'">
 								<div >
-									<icon id="36" svgfile="icons/module-language.svg" color="256" :size="constant.sizeSettings" is-native="true" @click="openModal('language')"
+									<icon id="36" svgfile="icons/module-language.svg" :color="256" :size="constant.sizeSettings" is-native="true" @click="openModal('language')"
 								></icon></div>
 								<div class="dialog-item-text">{{localizedL10n.stringLanguage}}</div>
 							</div>