`,
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
index b50a79e27..302229ec1 100644
--- 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
index 0a59cd279..a3fe3897d 100644
--- 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
index 5c7fc5ff5..a9889538c 100644
--- 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"
>
{{ warning.text }}
diff --git a/v2/js/screens/settings-aboutmyserver.js b/v2/js/screens/settings-aboutmyserver.js
index e3cbda1ef..4ddf94897 100644
--- a/v2/js/screens/settings-aboutmyserver.js
+++ b/v2/js/screens/settings-aboutmyserver.js
@@ -48,10 +48,10 @@ const AboutMyServer = {
@@ -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"
>
diff --git a/v2/js/screens/settings-myprivacy.js b/v2/js/screens/settings-myprivacy.js
index 68a8da62e..0633b24b9 100644
--- a/v2/js/screens/settings-myprivacy.js
+++ b/v2/js/screens/settings-myprivacy.js
@@ -22,8 +22,8 @@ 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')"
>
@@ -31,8 +31,8 @@ const MyPrivacy = {
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"
>
@@ -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')"
>
@@ -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')"
>
diff --git a/v2/js/screens/settings-mysecurity.js b/v2/js/screens/settings-mysecurity.js
index 77c040fef..6bb8bc930 100644
--- 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"
>
@@ -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"
>
diff --git a/v2/js/screens/settings.js b/v2/js/screens/settings.js
index a3150ce44..2ff01a512 100644
--- a/v2/js/screens/settings.js
+++ b/v2/js/screens/settings.js
@@ -22,31 +22,31 @@ const Settings = {