diff --git a/apps/documenteditor/main/app/controller/DocumentHolder.js b/apps/documenteditor/main/app/controller/DocumentHolder.js
index 616d2fa71..bb8e521f1 100644
--- a/apps/documenteditor/main/app/controller/DocumentHolder.js
+++ b/apps/documenteditor/main/app/controller/DocumentHolder.js
@@ -802,13 +802,13 @@ define([
},
onHyperlinkClick: function(url) {
- var me = this;
if (url) {
- if (me.api.asc_getUrlType(url)>0)
+ var type = this.api.asc_getUrlType(url);
+ if (type===AscCommon.c_oAscUrlType.Http || type===AscCommon.c_oAscUrlType.Email)
window.open(url);
else
Common.UI.warning({
- msg: me.documentHolder.txtWarnUrl,
+ msg: this.documentHolder.txtWarnUrl,
buttons: ['yes', 'no'],
primary: 'yes',
callback: function(btn) {
diff --git a/apps/documenteditor/main/app/view/HyperlinkSettingsDialog.js b/apps/documenteditor/main/app/view/HyperlinkSettingsDialog.js
index e5212662d..9fc36273c 100644
--- a/apps/documenteditor/main/app/view/HyperlinkSettingsDialog.js
+++ b/apps/documenteditor/main/app/view/HyperlinkSettingsDialog.js
@@ -98,6 +98,7 @@ define([
this.options.tpl = _.template(this.template)(this.options);
this.api = this.options.api;
this._originalProps = null;
+ this.urlType = AscCommon.c_oAscUrlType.Invalid;
Common.UI.Window.prototype.initialize.call(this, this.options);
},
@@ -135,9 +136,8 @@ define([
var trimmed = $.trim(value);
if (trimmed.length>2083) return me.txtSizeLimit;
- var urltype = me.api.asc_getUrlType(trimmed);
- me.isEmail = (urltype==2);
- return (urltype>0) ? true : me.txtNotUrl;
+ me.urlType = me.api.asc_getUrlType(trimmed);
+ return (me.urlType!==AscCommon.c_oAscUrlType.Invalid) ? true : me.txtNotUrl;
}
});
me.inputUrl._input.on('input', function (e) {
@@ -377,8 +377,8 @@ define([
if (type==c_oHyperlinkType.WebLink) {//WebLink
var url = $.trim(me.inputUrl.getValue());
- if (! /(((^https?)|(^ftp)):\/\/)|(^mailto:)/i.test(url) )
- url = ( (me.isEmail) ? 'mailto:' : 'http://' ) + url;
+ if (me.urlType!==AscCommon.c_oAscUrlType.Unsafe && ! /(((^https?)|(^ftp)):\/\/)|(^mailto:)/i.test(url) )
+ url = ( (me.urlType==AscCommon.c_oAscUrlType.Email) ? 'mailto:' : 'http://' ) + url;
url = url.replace(new RegExp("%20",'g')," ");
props.put_Value(url);
diff --git a/apps/documenteditor/mobile/locale/az.json b/apps/documenteditor/mobile/locale/az.json
index db173ce02..d58d881bc 100644
--- a/apps/documenteditor/mobile/locale/az.json
+++ b/apps/documenteditor/mobile/locale/az.json
@@ -199,7 +199,8 @@
"textOk": "OK",
"textRows": "Sətirlər",
"textRefreshEntireTable": "Refresh entire table",
- "textRefreshPageNumbersOnly": "Refresh page numbers only"
+ "textRefreshPageNumbersOnly": "Refresh page numbers only",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Edit": {
"notcriticalErrorTitle": "Xəbərdarlıq",
diff --git a/apps/documenteditor/mobile/locale/be.json b/apps/documenteditor/mobile/locale/be.json
index 47221919c..f060031e7 100644
--- a/apps/documenteditor/mobile/locale/be.json
+++ b/apps/documenteditor/mobile/locale/be.json
@@ -199,7 +199,8 @@
"menuSplit": "Split",
"textDoNotShowAgain": "Don't show again",
"textRefreshEntireTable": "Refresh entire table",
- "textRefreshPageNumbersOnly": "Refresh page numbers only"
+ "textRefreshPageNumbersOnly": "Refresh page numbers only",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Edit": {
"notcriticalErrorTitle": "Увага",
diff --git a/apps/documenteditor/mobile/locale/bg.json b/apps/documenteditor/mobile/locale/bg.json
index 3399a51e1..138efd223 100644
--- a/apps/documenteditor/mobile/locale/bg.json
+++ b/apps/documenteditor/mobile/locale/bg.json
@@ -199,7 +199,8 @@
"textCancel": "Cancel",
"textNumberingValue": "Numbering Value",
"textRefreshEntireTable": "Refresh entire table",
- "textRefreshPageNumbersOnly": "Refresh page numbers only"
+ "textRefreshPageNumbersOnly": "Refresh page numbers only",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Edit": {
"notcriticalErrorTitle": "Warning",
diff --git a/apps/documenteditor/mobile/locale/ca.json b/apps/documenteditor/mobile/locale/ca.json
index f63d8bb05..0a9e9f17f 100644
--- a/apps/documenteditor/mobile/locale/ca.json
+++ b/apps/documenteditor/mobile/locale/ca.json
@@ -199,7 +199,8 @@
"textOk": "D'acord",
"textRefreshEntireTable": "Actualitza la taula sencera",
"textRefreshPageNumbersOnly": "Actualitza només els números de pàgina",
- "textRows": "Files"
+ "textRows": "Files",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Edit": {
"notcriticalErrorTitle": "Advertiment",
diff --git a/apps/documenteditor/mobile/locale/cs.json b/apps/documenteditor/mobile/locale/cs.json
index 9618f2787..e8ab65893 100644
--- a/apps/documenteditor/mobile/locale/cs.json
+++ b/apps/documenteditor/mobile/locale/cs.json
@@ -199,7 +199,8 @@
"textOk": "OK",
"textRows": "Řádky",
"textRefreshEntireTable": "Refresh entire table",
- "textRefreshPageNumbersOnly": "Refresh page numbers only"
+ "textRefreshPageNumbersOnly": "Refresh page numbers only",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Edit": {
"notcriticalErrorTitle": "Varování",
diff --git a/apps/documenteditor/mobile/locale/da.json b/apps/documenteditor/mobile/locale/da.json
index 3399a51e1..138efd223 100644
--- a/apps/documenteditor/mobile/locale/da.json
+++ b/apps/documenteditor/mobile/locale/da.json
@@ -199,7 +199,8 @@
"textCancel": "Cancel",
"textNumberingValue": "Numbering Value",
"textRefreshEntireTable": "Refresh entire table",
- "textRefreshPageNumbersOnly": "Refresh page numbers only"
+ "textRefreshPageNumbersOnly": "Refresh page numbers only",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Edit": {
"notcriticalErrorTitle": "Warning",
diff --git a/apps/documenteditor/mobile/locale/de.json b/apps/documenteditor/mobile/locale/de.json
index dc3911241..cfc6d1dfc 100644
--- a/apps/documenteditor/mobile/locale/de.json
+++ b/apps/documenteditor/mobile/locale/de.json
@@ -199,7 +199,8 @@
"textOk": "OK",
"textRefreshEntireTable": "Ganze Tabelle aktualisieren",
"textRefreshPageNumbersOnly": "Nur Seitenzahlen aktualisieren",
- "textRows": "Zeilen"
+ "textRows": "Zeilen",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Edit": {
"notcriticalErrorTitle": "Warnung",
diff --git a/apps/documenteditor/mobile/locale/el.json b/apps/documenteditor/mobile/locale/el.json
index 9c29926c5..fe166ceaa 100644
--- a/apps/documenteditor/mobile/locale/el.json
+++ b/apps/documenteditor/mobile/locale/el.json
@@ -199,7 +199,8 @@
"textOk": "Εντάξει",
"textRefreshEntireTable": "Ανανέωση ολόκληρου πίνακα",
"textRefreshPageNumbersOnly": "Ανανέωση αριθμών σελίδων μόνο",
- "textRows": "Γραμμές"
+ "textRows": "Γραμμές",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Edit": {
"notcriticalErrorTitle": "Προειδοποίηση",
diff --git a/apps/documenteditor/mobile/locale/en.json b/apps/documenteditor/mobile/locale/en.json
index e71c9ec84..c7799330d 100644
--- a/apps/documenteditor/mobile/locale/en.json
+++ b/apps/documenteditor/mobile/locale/en.json
@@ -199,7 +199,8 @@
"textOk": "OK",
"textRefreshEntireTable": "Refresh entire table",
"textRefreshPageNumbersOnly": "Refresh page numbers only",
- "textRows": "Rows"
+ "textRows": "Rows",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Edit": {
"notcriticalErrorTitle": "Warning",
diff --git a/apps/documenteditor/mobile/locale/es.json b/apps/documenteditor/mobile/locale/es.json
index e5e7e46ea..8effdba59 100644
--- a/apps/documenteditor/mobile/locale/es.json
+++ b/apps/documenteditor/mobile/locale/es.json
@@ -199,7 +199,8 @@
"textOk": "OK",
"textRefreshEntireTable": "Actualizar toda la tabla",
"textRefreshPageNumbersOnly": "Actualizar solamente los números de página",
- "textRows": "Filas"
+ "textRows": "Filas",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Edit": {
"notcriticalErrorTitle": "Advertencia",
diff --git a/apps/documenteditor/mobile/locale/eu.json b/apps/documenteditor/mobile/locale/eu.json
index 98dba50e0..d0d29b646 100644
--- a/apps/documenteditor/mobile/locale/eu.json
+++ b/apps/documenteditor/mobile/locale/eu.json
@@ -199,7 +199,8 @@
"textOk": "Ados",
"textRefreshEntireTable": "Freskatu taula osoa",
"textRefreshPageNumbersOnly": "Freskatu orri-zenbakiak soilik",
- "textRows": "Errenkadak"
+ "textRows": "Errenkadak",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Edit": {
"notcriticalErrorTitle": "Abisua",
diff --git a/apps/documenteditor/mobile/locale/fi.json b/apps/documenteditor/mobile/locale/fi.json
index 3399a51e1..138efd223 100644
--- a/apps/documenteditor/mobile/locale/fi.json
+++ b/apps/documenteditor/mobile/locale/fi.json
@@ -199,7 +199,8 @@
"textCancel": "Cancel",
"textNumberingValue": "Numbering Value",
"textRefreshEntireTable": "Refresh entire table",
- "textRefreshPageNumbersOnly": "Refresh page numbers only"
+ "textRefreshPageNumbersOnly": "Refresh page numbers only",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Edit": {
"notcriticalErrorTitle": "Warning",
diff --git a/apps/documenteditor/mobile/locale/fr.json b/apps/documenteditor/mobile/locale/fr.json
index 6a7d2ec61..ac6060e32 100644
--- a/apps/documenteditor/mobile/locale/fr.json
+++ b/apps/documenteditor/mobile/locale/fr.json
@@ -199,7 +199,8 @@
"textOk": "Ok",
"textRefreshEntireTable": "Actualiser le tableau entier",
"textRefreshPageNumbersOnly": "Actualiser les numéros de page uniquement",
- "textRows": "Lignes"
+ "textRows": "Lignes",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Edit": {
"notcriticalErrorTitle": "Avertissement",
diff --git a/apps/documenteditor/mobile/locale/gl.json b/apps/documenteditor/mobile/locale/gl.json
index e993d8ca6..7fbb8234c 100644
--- a/apps/documenteditor/mobile/locale/gl.json
+++ b/apps/documenteditor/mobile/locale/gl.json
@@ -199,7 +199,8 @@
"textOk": "Aceptar",
"textRefreshEntireTable": "Actualizar toda a táboa",
"textRefreshPageNumbersOnly": "Actualizar soamente os números de páxina",
- "textRows": "Filas"
+ "textRows": "Filas",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Edit": {
"notcriticalErrorTitle": "Aviso",
diff --git a/apps/documenteditor/mobile/locale/hu.json b/apps/documenteditor/mobile/locale/hu.json
index 92b6aec46..62e0e0610 100644
--- a/apps/documenteditor/mobile/locale/hu.json
+++ b/apps/documenteditor/mobile/locale/hu.json
@@ -199,7 +199,8 @@
"textOk": "OK",
"textRows": "Sorok",
"textRefreshEntireTable": "Refresh entire table",
- "textRefreshPageNumbersOnly": "Refresh page numbers only"
+ "textRefreshPageNumbersOnly": "Refresh page numbers only",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Edit": {
"notcriticalErrorTitle": "Figyelmeztetés",
diff --git a/apps/documenteditor/mobile/locale/hy.json b/apps/documenteditor/mobile/locale/hy.json
index 4590c4f3f..2590428d9 100644
--- a/apps/documenteditor/mobile/locale/hy.json
+++ b/apps/documenteditor/mobile/locale/hy.json
@@ -199,7 +199,8 @@
"textOk": "Լավ",
"textRefreshEntireTable": "Թարմացրել ամբողջ աղյուսակը",
"textRefreshPageNumbersOnly": "Թարմացնել միայն էջերի համարները",
- "textRows": "Տողեր"
+ "textRows": "Տողեր",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Edit": {
"notcriticalErrorTitle": "Զգուշացում",
diff --git a/apps/documenteditor/mobile/locale/id.json b/apps/documenteditor/mobile/locale/id.json
index 82f151e09..e6f0e90f7 100644
--- a/apps/documenteditor/mobile/locale/id.json
+++ b/apps/documenteditor/mobile/locale/id.json
@@ -199,7 +199,8 @@
"textOk": "OK",
"textRows": "Baris",
"textRefreshEntireTable": "Refresh entire table",
- "textRefreshPageNumbersOnly": "Refresh page numbers only"
+ "textRefreshPageNumbersOnly": "Refresh page numbers only",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Edit": {
"notcriticalErrorTitle": "Peringatan",
diff --git a/apps/documenteditor/mobile/locale/it.json b/apps/documenteditor/mobile/locale/it.json
index 50374ae0c..707a87f5d 100644
--- a/apps/documenteditor/mobile/locale/it.json
+++ b/apps/documenteditor/mobile/locale/it.json
@@ -199,7 +199,8 @@
"textOk": "OK",
"textRows": "Righe",
"textRefreshEntireTable": "Refresh entire table",
- "textRefreshPageNumbersOnly": "Refresh page numbers only"
+ "textRefreshPageNumbersOnly": "Refresh page numbers only",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Edit": {
"notcriticalErrorTitle": "Avvertimento",
diff --git a/apps/documenteditor/mobile/locale/ja.json b/apps/documenteditor/mobile/locale/ja.json
index 9699489e3..70a31013f 100644
--- a/apps/documenteditor/mobile/locale/ja.json
+++ b/apps/documenteditor/mobile/locale/ja.json
@@ -199,7 +199,8 @@
"textOk": "OK",
"textRefreshEntireTable": "テーブル全体を更新する",
"textRefreshPageNumbersOnly": "ページ番号のみを更新する",
- "textRows": "行"
+ "textRows": "行",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Edit": {
"notcriticalErrorTitle": " 警告",
diff --git a/apps/documenteditor/mobile/locale/ko.json b/apps/documenteditor/mobile/locale/ko.json
index 1f5dff0ea..3155b17d5 100644
--- a/apps/documenteditor/mobile/locale/ko.json
+++ b/apps/documenteditor/mobile/locale/ko.json
@@ -199,7 +199,8 @@
"textOk": "확인",
"textRows": "행",
"textRefreshEntireTable": "Refresh entire table",
- "textRefreshPageNumbersOnly": "Refresh page numbers only"
+ "textRefreshPageNumbersOnly": "Refresh page numbers only",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Edit": {
"notcriticalErrorTitle": "경고",
diff --git a/apps/documenteditor/mobile/locale/lo.json b/apps/documenteditor/mobile/locale/lo.json
index 6395b9d73..636d28ed9 100644
--- a/apps/documenteditor/mobile/locale/lo.json
+++ b/apps/documenteditor/mobile/locale/lo.json
@@ -199,7 +199,8 @@
"textOk": "ຕົກລົງ",
"textRows": "ແຖວ",
"textRefreshEntireTable": "Refresh entire table",
- "textRefreshPageNumbersOnly": "Refresh page numbers only"
+ "textRefreshPageNumbersOnly": "Refresh page numbers only",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Edit": {
"notcriticalErrorTitle": "ເຕືອນ",
diff --git a/apps/documenteditor/mobile/locale/lv.json b/apps/documenteditor/mobile/locale/lv.json
index 3399a51e1..138efd223 100644
--- a/apps/documenteditor/mobile/locale/lv.json
+++ b/apps/documenteditor/mobile/locale/lv.json
@@ -199,7 +199,8 @@
"textCancel": "Cancel",
"textNumberingValue": "Numbering Value",
"textRefreshEntireTable": "Refresh entire table",
- "textRefreshPageNumbersOnly": "Refresh page numbers only"
+ "textRefreshPageNumbersOnly": "Refresh page numbers only",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Edit": {
"notcriticalErrorTitle": "Warning",
diff --git a/apps/documenteditor/mobile/locale/ms.json b/apps/documenteditor/mobile/locale/ms.json
index 50560948f..a5ac44475 100644
--- a/apps/documenteditor/mobile/locale/ms.json
+++ b/apps/documenteditor/mobile/locale/ms.json
@@ -199,7 +199,8 @@
"textOk": "Okey",
"textRows": "Baris",
"textRefreshEntireTable": "Refresh entire table",
- "textRefreshPageNumbersOnly": "Refresh page numbers only"
+ "textRefreshPageNumbersOnly": "Refresh page numbers only",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Edit": {
"notcriticalErrorTitle": "Amaran",
diff --git a/apps/documenteditor/mobile/locale/nb.json b/apps/documenteditor/mobile/locale/nb.json
index 3399a51e1..138efd223 100644
--- a/apps/documenteditor/mobile/locale/nb.json
+++ b/apps/documenteditor/mobile/locale/nb.json
@@ -199,7 +199,8 @@
"textCancel": "Cancel",
"textNumberingValue": "Numbering Value",
"textRefreshEntireTable": "Refresh entire table",
- "textRefreshPageNumbersOnly": "Refresh page numbers only"
+ "textRefreshPageNumbersOnly": "Refresh page numbers only",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Edit": {
"notcriticalErrorTitle": "Warning",
diff --git a/apps/documenteditor/mobile/locale/nl.json b/apps/documenteditor/mobile/locale/nl.json
index 3d66ef21c..1441b1807 100644
--- a/apps/documenteditor/mobile/locale/nl.json
+++ b/apps/documenteditor/mobile/locale/nl.json
@@ -199,7 +199,8 @@
"textOk": "OK",
"textRows": "Rijen",
"textRefreshEntireTable": "Refresh entire table",
- "textRefreshPageNumbersOnly": "Refresh page numbers only"
+ "textRefreshPageNumbersOnly": "Refresh page numbers only",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Edit": {
"notcriticalErrorTitle": "Waarschuwing",
diff --git a/apps/documenteditor/mobile/locale/pl.json b/apps/documenteditor/mobile/locale/pl.json
index 3399a51e1..138efd223 100644
--- a/apps/documenteditor/mobile/locale/pl.json
+++ b/apps/documenteditor/mobile/locale/pl.json
@@ -199,7 +199,8 @@
"textCancel": "Cancel",
"textNumberingValue": "Numbering Value",
"textRefreshEntireTable": "Refresh entire table",
- "textRefreshPageNumbersOnly": "Refresh page numbers only"
+ "textRefreshPageNumbersOnly": "Refresh page numbers only",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Edit": {
"notcriticalErrorTitle": "Warning",
diff --git a/apps/documenteditor/mobile/locale/pt-PT.json b/apps/documenteditor/mobile/locale/pt-PT.json
index 64bbcf0f6..cbff81b49 100644
--- a/apps/documenteditor/mobile/locale/pt-PT.json
+++ b/apps/documenteditor/mobile/locale/pt-PT.json
@@ -199,7 +199,8 @@
"textOk": "Ok",
"textRows": "Linhas",
"textRefreshEntireTable": "Refresh entire table",
- "textRefreshPageNumbersOnly": "Refresh page numbers only"
+ "textRefreshPageNumbersOnly": "Refresh page numbers only",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Edit": {
"notcriticalErrorTitle": "Aviso",
diff --git a/apps/documenteditor/mobile/locale/pt.json b/apps/documenteditor/mobile/locale/pt.json
index 78efa4251..9c6f04300 100644
--- a/apps/documenteditor/mobile/locale/pt.json
+++ b/apps/documenteditor/mobile/locale/pt.json
@@ -199,7 +199,8 @@
"textOk": "OK",
"textRows": "Linhas",
"textRefreshEntireTable": "Refresh entire table",
- "textRefreshPageNumbersOnly": "Refresh page numbers only"
+ "textRefreshPageNumbersOnly": "Refresh page numbers only",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Edit": {
"notcriticalErrorTitle": "Aviso",
diff --git a/apps/documenteditor/mobile/locale/ro.json b/apps/documenteditor/mobile/locale/ro.json
index f5b2e2a89..85c25be84 100644
--- a/apps/documenteditor/mobile/locale/ro.json
+++ b/apps/documenteditor/mobile/locale/ro.json
@@ -199,7 +199,8 @@
"textOk": "OK",
"textRefreshEntireTable": "Reîmprospătarea întregului tabel",
"textRefreshPageNumbersOnly": "Actualizare numai numere de pagină",
- "textRows": "Rânduri"
+ "textRows": "Rânduri",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Edit": {
"notcriticalErrorTitle": "Avertisment",
diff --git a/apps/documenteditor/mobile/locale/ru.json b/apps/documenteditor/mobile/locale/ru.json
index 617d4bc35..56a7632e8 100644
--- a/apps/documenteditor/mobile/locale/ru.json
+++ b/apps/documenteditor/mobile/locale/ru.json
@@ -199,7 +199,8 @@
"textOk": "Ok",
"textRefreshEntireTable": "Обновить целиком",
"textRefreshPageNumbersOnly": "Обновить только номера страниц",
- "textRows": "Строки"
+ "textRows": "Строки",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Edit": {
"notcriticalErrorTitle": "Внимание",
diff --git a/apps/documenteditor/mobile/locale/sk.json b/apps/documenteditor/mobile/locale/sk.json
index 8b6624a85..d8e0ae7b4 100644
--- a/apps/documenteditor/mobile/locale/sk.json
+++ b/apps/documenteditor/mobile/locale/sk.json
@@ -199,7 +199,8 @@
"textOk": "OK",
"textRows": "Riadky",
"textRefreshEntireTable": "Refresh entire table",
- "textRefreshPageNumbersOnly": "Refresh page numbers only"
+ "textRefreshPageNumbersOnly": "Refresh page numbers only",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Edit": {
"notcriticalErrorTitle": "Upozornenie",
diff --git a/apps/documenteditor/mobile/locale/sl.json b/apps/documenteditor/mobile/locale/sl.json
index 3399a51e1..138efd223 100644
--- a/apps/documenteditor/mobile/locale/sl.json
+++ b/apps/documenteditor/mobile/locale/sl.json
@@ -199,7 +199,8 @@
"textCancel": "Cancel",
"textNumberingValue": "Numbering Value",
"textRefreshEntireTable": "Refresh entire table",
- "textRefreshPageNumbersOnly": "Refresh page numbers only"
+ "textRefreshPageNumbersOnly": "Refresh page numbers only",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Edit": {
"notcriticalErrorTitle": "Warning",
diff --git a/apps/documenteditor/mobile/locale/sv.json b/apps/documenteditor/mobile/locale/sv.json
index 3399a51e1..138efd223 100644
--- a/apps/documenteditor/mobile/locale/sv.json
+++ b/apps/documenteditor/mobile/locale/sv.json
@@ -199,7 +199,8 @@
"textCancel": "Cancel",
"textNumberingValue": "Numbering Value",
"textRefreshEntireTable": "Refresh entire table",
- "textRefreshPageNumbersOnly": "Refresh page numbers only"
+ "textRefreshPageNumbersOnly": "Refresh page numbers only",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Edit": {
"notcriticalErrorTitle": "Warning",
diff --git a/apps/documenteditor/mobile/locale/tr.json b/apps/documenteditor/mobile/locale/tr.json
index cefda56e8..2c0ca473f 100644
--- a/apps/documenteditor/mobile/locale/tr.json
+++ b/apps/documenteditor/mobile/locale/tr.json
@@ -199,7 +199,8 @@
"textOk": "Tamam",
"textRows": "Satırlar",
"textRefreshEntireTable": "Refresh entire table",
- "textRefreshPageNumbersOnly": "Refresh page numbers only"
+ "textRefreshPageNumbersOnly": "Refresh page numbers only",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Edit": {
"notcriticalErrorTitle": "Dikkat",
diff --git a/apps/documenteditor/mobile/locale/uk.json b/apps/documenteditor/mobile/locale/uk.json
index 2ecccca14..fe8c14f98 100644
--- a/apps/documenteditor/mobile/locale/uk.json
+++ b/apps/documenteditor/mobile/locale/uk.json
@@ -199,7 +199,8 @@
"textOk": "Ок",
"textRows": "Рядки",
"textRefreshEntireTable": "Refresh entire table",
- "textRefreshPageNumbersOnly": "Refresh page numbers only"
+ "textRefreshPageNumbersOnly": "Refresh page numbers only",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Edit": {
"notcriticalErrorTitle": "Увага",
diff --git a/apps/documenteditor/mobile/locale/vi.json b/apps/documenteditor/mobile/locale/vi.json
index 3399a51e1..138efd223 100644
--- a/apps/documenteditor/mobile/locale/vi.json
+++ b/apps/documenteditor/mobile/locale/vi.json
@@ -199,7 +199,8 @@
"textCancel": "Cancel",
"textNumberingValue": "Numbering Value",
"textRefreshEntireTable": "Refresh entire table",
- "textRefreshPageNumbersOnly": "Refresh page numbers only"
+ "textRefreshPageNumbersOnly": "Refresh page numbers only",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Edit": {
"notcriticalErrorTitle": "Warning",
diff --git a/apps/documenteditor/mobile/locale/zh-TW.json b/apps/documenteditor/mobile/locale/zh-TW.json
index 7148b54b4..f7aa4b1c1 100644
--- a/apps/documenteditor/mobile/locale/zh-TW.json
+++ b/apps/documenteditor/mobile/locale/zh-TW.json
@@ -199,7 +199,8 @@
"textOk": "確定",
"textRows": "行列",
"textRefreshEntireTable": "Refresh entire table",
- "textRefreshPageNumbersOnly": "Refresh page numbers only"
+ "textRefreshPageNumbersOnly": "Refresh page numbers only",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Edit": {
"notcriticalErrorTitle": "警告",
diff --git a/apps/documenteditor/mobile/locale/zh.json b/apps/documenteditor/mobile/locale/zh.json
index 3aa7006cf..3d050b743 100644
--- a/apps/documenteditor/mobile/locale/zh.json
+++ b/apps/documenteditor/mobile/locale/zh.json
@@ -199,7 +199,8 @@
"textOk": "好",
"textRefreshEntireTable": "刷新整个表格",
"textRefreshPageNumbersOnly": "仅刷新页号",
- "textRows": "行"
+ "textRows": "行",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Edit": {
"notcriticalErrorTitle": "警告",
diff --git a/apps/documenteditor/mobile/src/controller/ContextMenu.jsx b/apps/documenteditor/mobile/src/controller/ContextMenu.jsx
index e92ef2281..9ff1402a7 100644
--- a/apps/documenteditor/mobile/src/controller/ContextMenu.jsx
+++ b/apps/documenteditor/mobile/src/controller/ContextMenu.jsx
@@ -215,10 +215,31 @@ class ContextMenu extends ContextMenuController {
}
openLink(url) {
- if (Common.EditorApi.get().asc_getUrlType(url) > 0) {
- const newDocumentPage = window.open(url, '_blank');
- if (newDocumentPage) {
- newDocumentPage.focus();
+ if (url) {
+ const type = Common.EditorApi.get().asc_getUrlType(url);
+ if (type===AscCommon.c_oAscUrlType.Http || type===AscCommon.c_oAscUrlType.Email) {
+ const newDocumentPage = window.open(url, '_blank');
+ if (newDocumentPage) {
+ newDocumentPage.focus();
+ }
+ } else {
+ const { t } = this.props;
+ const _t = t("ContextMenu", { returnObjects: true });
+ f7.dialog.create({
+ title: t('Settings', {returnObjects: true}).notcriticalErrorTitle,
+ text : _t.txtWarnUrl,
+ buttons: [{
+ text: _t.textOk,
+ bold: true,
+ onClick: () => {
+ const newDocumentPage = window.open(url, '_blank');
+ if (newDocumentPage) {
+ newDocumentPage.focus();
+ }
+ }
+ },
+ { text: _t.menuCancel }]
+ }).open();
}
}
}
diff --git a/apps/documenteditor/mobile/src/controller/add/AddLink.jsx b/apps/documenteditor/mobile/src/controller/add/AddLink.jsx
index ba1b1f882..1bc642503 100644
--- a/apps/documenteditor/mobile/src/controller/add/AddLink.jsx
+++ b/apps/documenteditor/mobile/src/controller/add/AddLink.jsx
@@ -29,11 +29,9 @@ class AddLinkController extends Component {
const { t } = this.props;
const _t = t("Add", { returnObjects: true });
-
const urltype = api.asc_getUrlType(url.trim());
- const isEmail = (urltype == 2);
- if (urltype < 1) {
+ if (urltype===AscCommon.c_oAscUrlType.Invalid) {
f7.dialog.create({
title: _t.notcriticalErrorTitle,
text: _t.txtNotUrl,
@@ -48,8 +46,8 @@ class AddLinkController extends Component {
let _url = url.replace(/^\s+|\s+$/g,'');
- if (! /(((^https?)|(^ftp)):\/\/)|(^mailto:)/i.test(_url) )
- _url = (isEmail ? 'mailto:' : 'http://' ) + _url;
+ if (urltype!==AscCommon.c_oAscUrlType.Unsafe && ! /(((^https?)|(^ftp)):\/\/)|(^mailto:)/i.test(_url) )
+ _url = (urltype===AscCommon.c_oAscUrlType.Email ? 'mailto:' : 'http://' ) + _url;
_url = _url.replace(new RegExp("%20",'g')," ");
diff --git a/apps/documenteditor/mobile/src/controller/edit/EditHyperlink.jsx b/apps/documenteditor/mobile/src/controller/edit/EditHyperlink.jsx
index 39e0a7ad3..9f2f5fbdc 100644
--- a/apps/documenteditor/mobile/src/controller/edit/EditHyperlink.jsx
+++ b/apps/documenteditor/mobile/src/controller/edit/EditHyperlink.jsx
@@ -25,8 +25,7 @@ class EditHyperlinkController extends Component {
const api = Common.EditorApi.get();
if (api) {
const urltype = api.asc_getUrlType(link.trim());
- const isEmail = (urltype == 2);
- if (urltype < 1) {
+ if (urltype===AscCommon.c_oAscUrlType.Invalid) {
const { t } = this.props;
f7.dialog.create({
@@ -42,8 +41,8 @@ class EditHyperlinkController extends Component {
return;
}
let url = link.replace(/^\s+|\s+$/g,'');
- if (! /(((^https?)|(^ftp)):\/\/)|(^mailto:)/i.test(url) ) {
- url = (isEmail ? 'mailto:' : 'http://') + url;
+ if (urltype!==AscCommon.c_oAscUrlType.Unsafe && ! /(((^https?)|(^ftp)):\/\/)|(^mailto:)/i.test(url) ) {
+ url = (urltype===AscCommon.c_oAscUrlType.Email ? 'mailto:' : 'http://') + url;
}
url = url.replace(new RegExp("%20",'g')," ");
const props = new Asc.CHyperlinkProperty();
diff --git a/apps/presentationeditor/main/app/controller/DocumentHolder.js b/apps/presentationeditor/main/app/controller/DocumentHolder.js
index c8fdd94b8..e4988371d 100644
--- a/apps/presentationeditor/main/app/controller/DocumentHolder.js
+++ b/apps/presentationeditor/main/app/controller/DocumentHolder.js
@@ -759,13 +759,13 @@ define([
},
onHyperlinkClick: function(url) {
- var me = this;
if (url) {
- if (me.api.asc_getUrlType(url)>0)
+ var type = this.api.asc_getUrlType(url);
+ if (type===AscCommon.c_oAscUrlType.Http || type===AscCommon.c_oAscUrlType.Email)
window.open(url);
else
Common.UI.warning({
- msg: me.documentHolder.txtWarnUrl,
+ msg: this.documentHolder.txtWarnUrl,
buttons: ['yes', 'no'],
primary: 'yes',
callback: function(btn) {
diff --git a/apps/presentationeditor/main/app/view/HyperlinkSettingsDialog.js b/apps/presentationeditor/main/app/view/HyperlinkSettingsDialog.js
index 0b98ddbe8..ba97812f9 100644
--- a/apps/presentationeditor/main/app/view/HyperlinkSettingsDialog.js
+++ b/apps/presentationeditor/main/app/view/HyperlinkSettingsDialog.js
@@ -100,6 +100,7 @@ define([
this.options.tpl = _.template(this.template)(this.options);
this.slides = this.options.slides;
this.api = this.options.api;
+ this.urlType = AscCommon.c_oAscUrlType.Invalid;
Common.UI.Window.prototype.initialize.call(this, this.options);
},
@@ -137,9 +138,8 @@ define([
var trimmed = $.trim(value);
if (trimmed.length>2083) return me.txtSizeLimit;
- var urltype = me.api.asc_getUrlType(trimmed);
- me.isEmail = (urltype==2);
- return (urltype>0) ? true : me.txtNotUrl;
+ me.urlType = me.api.asc_getUrlType(trimmed);
+ return (me.urlType!==AscCommon.c_oAscUrlType.Invalid) ? true : me.txtNotUrl;
}
});
me.inputUrl._input.on('input', function (e) {
@@ -236,8 +236,8 @@ define([
def_display = tip;
} else {
var url = $.trim(me.inputUrl.getValue());
- if (! /(((^https?)|(^ftp)):\/\/)|(^mailto:)/i.test(url) )
- url = ( (me.isEmail) ? 'mailto:' : 'http://' ) + url;
+ if (me.urlType!==AscCommon.c_oAscUrlType.Unsafe && ! /(((^https?)|(^ftp)):\/\/)|(^mailto:)/i.test(url) )
+ url = ( (me.urlType==AscCommon.c_oAscUrlType.Email) ? 'mailto:' : 'http://' ) + url;
url = url.replace(new RegExp("%20",'g')," ");
props.put_Value( url );
props.put_ToolTip(me.inputTip.getValue());
diff --git a/apps/presentationeditor/mobile/locale/az.json b/apps/presentationeditor/mobile/locale/az.json
index 6ba887ff3..c50ad4286 100644
--- a/apps/presentationeditor/mobile/locale/az.json
+++ b/apps/presentationeditor/mobile/locale/az.json
@@ -59,7 +59,9 @@
"textColumns": "Sütunlar",
"textCopyCutPasteActions": "Kopyalama, Kəsmə və Yapışdırma Əməliyyatları",
"textDoNotShowAgain": "Bir daha göstərmə",
- "textRows": "Sətirlər"
+ "textRows": "Sətirlər",
+ "textOk": "Ok",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Controller": {
"Main": {
diff --git a/apps/presentationeditor/mobile/locale/be.json b/apps/presentationeditor/mobile/locale/be.json
index c94666f6e..a2c77181f 100644
--- a/apps/presentationeditor/mobile/locale/be.json
+++ b/apps/presentationeditor/mobile/locale/be.json
@@ -59,7 +59,9 @@
"textCopyCutPasteActions": "Скапіяваць, выразаць, уставіць",
"textRows": "Радкі",
"menuSplit": "Split",
- "textDoNotShowAgain": "Don't show again"
+ "textDoNotShowAgain": "Don't show again",
+ "textOk": "Ok",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Controller": {
"Main": {
diff --git a/apps/presentationeditor/mobile/locale/bg.json b/apps/presentationeditor/mobile/locale/bg.json
index d1a9482c5..faab8267a 100644
--- a/apps/presentationeditor/mobile/locale/bg.json
+++ b/apps/presentationeditor/mobile/locale/bg.json
@@ -59,7 +59,9 @@
"textColumns": "Columns",
"textCopyCutPasteActions": "Copy, Cut and Paste Actions",
"textDoNotShowAgain": "Don't show again",
- "textRows": "Rows"
+ "textRows": "Rows",
+ "textOk": "Ok",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Controller": {
"Main": {
diff --git a/apps/presentationeditor/mobile/locale/ca.json b/apps/presentationeditor/mobile/locale/ca.json
index ca6408185..a7b55f0ec 100644
--- a/apps/presentationeditor/mobile/locale/ca.json
+++ b/apps/presentationeditor/mobile/locale/ca.json
@@ -59,7 +59,9 @@
"textColumns": "Columnes",
"textCopyCutPasteActions": "Accions de copiar, tallar i enganxar ",
"textDoNotShowAgain": "No ho mostris més",
- "textRows": "Files"
+ "textRows": "Files",
+ "textOk": "Ok",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Controller": {
"Main": {
diff --git a/apps/presentationeditor/mobile/locale/cs.json b/apps/presentationeditor/mobile/locale/cs.json
index 621f2e638..5135755ba 100644
--- a/apps/presentationeditor/mobile/locale/cs.json
+++ b/apps/presentationeditor/mobile/locale/cs.json
@@ -59,7 +59,9 @@
"textColumns": "Sloupce",
"textCopyCutPasteActions": "Akce kopírovat, vyjmout a vložit",
"textDoNotShowAgain": "Nezobrazovat znovu",
- "textRows": "Řádky"
+ "textRows": "Řádky",
+ "textOk": "Ok",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Controller": {
"Main": {
diff --git a/apps/presentationeditor/mobile/locale/de.json b/apps/presentationeditor/mobile/locale/de.json
index 5a09fde5f..e95c2b5d2 100644
--- a/apps/presentationeditor/mobile/locale/de.json
+++ b/apps/presentationeditor/mobile/locale/de.json
@@ -59,7 +59,9 @@
"textColumns": "Spalten",
"textCopyCutPasteActions": "Kopieren, Ausschneiden und Einfügen",
"textDoNotShowAgain": "Nicht mehr anzeigen",
- "textRows": "Zeilen"
+ "textRows": "Zeilen",
+ "textOk": "Ok",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Controller": {
"Main": {
diff --git a/apps/presentationeditor/mobile/locale/el.json b/apps/presentationeditor/mobile/locale/el.json
index 688eb50ed..b722f911f 100644
--- a/apps/presentationeditor/mobile/locale/el.json
+++ b/apps/presentationeditor/mobile/locale/el.json
@@ -59,7 +59,9 @@
"textColumns": "Στήλες",
"textCopyCutPasteActions": "Ενέργειες Αντιγραφής, Αποκοπής και Επικόλλησης",
"textDoNotShowAgain": "Να μην εμφανιστεί ξανά",
- "textRows": "Γραμμές"
+ "textRows": "Γραμμές",
+ "textOk": "Ok",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Controller": {
"Main": {
diff --git a/apps/presentationeditor/mobile/locale/en.json b/apps/presentationeditor/mobile/locale/en.json
index 0123731c8..bde8aed36 100644
--- a/apps/presentationeditor/mobile/locale/en.json
+++ b/apps/presentationeditor/mobile/locale/en.json
@@ -59,7 +59,9 @@
"textColumns": "Columns",
"textCopyCutPasteActions": "Copy, Cut and Paste Actions",
"textDoNotShowAgain": "Don't show again",
- "textRows": "Rows"
+ "textRows": "Rows",
+ "textOk": "Ok",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Controller": {
"Main": {
diff --git a/apps/presentationeditor/mobile/locale/es.json b/apps/presentationeditor/mobile/locale/es.json
index f58784f75..0a2d06b68 100644
--- a/apps/presentationeditor/mobile/locale/es.json
+++ b/apps/presentationeditor/mobile/locale/es.json
@@ -59,7 +59,9 @@
"textColumns": "Columnas",
"textCopyCutPasteActions": "Acciones de Copiar, Cortar y Pegar",
"textDoNotShowAgain": "No mostrar de nuevo",
- "textRows": "Filas"
+ "textRows": "Filas",
+ "textOk": "Ok",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Controller": {
"Main": {
diff --git a/apps/presentationeditor/mobile/locale/eu.json b/apps/presentationeditor/mobile/locale/eu.json
index 8c12bcbec..f991f8a1e 100644
--- a/apps/presentationeditor/mobile/locale/eu.json
+++ b/apps/presentationeditor/mobile/locale/eu.json
@@ -59,7 +59,9 @@
"textColumns": "Zutabeak",
"textCopyCutPasteActions": "Kopiatu, ebaki eta itsatsi ekintzak",
"textDoNotShowAgain": "Ez erakutsi berriro",
- "textRows": "Errenkadak"
+ "textRows": "Errenkadak",
+ "textOk": "Ok",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Controller": {
"Main": {
diff --git a/apps/presentationeditor/mobile/locale/fr.json b/apps/presentationeditor/mobile/locale/fr.json
index bde02a908..ac5c0ab28 100644
--- a/apps/presentationeditor/mobile/locale/fr.json
+++ b/apps/presentationeditor/mobile/locale/fr.json
@@ -59,7 +59,9 @@
"textColumns": "Colonnes",
"textCopyCutPasteActions": "Fonctions de Copier, Couper et Coller",
"textDoNotShowAgain": "Ne plus afficher",
- "textRows": "Lignes"
+ "textRows": "Lignes",
+ "textOk": "Ok",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Controller": {
"Main": {
diff --git a/apps/presentationeditor/mobile/locale/gl.json b/apps/presentationeditor/mobile/locale/gl.json
index c4a005f57..1596a6333 100644
--- a/apps/presentationeditor/mobile/locale/gl.json
+++ b/apps/presentationeditor/mobile/locale/gl.json
@@ -59,7 +59,9 @@
"textColumns": "Columnas",
"textCopyCutPasteActions": "Accións de copiar, cortar e pegar",
"textDoNotShowAgain": "Non amosar de novo",
- "textRows": "Filas"
+ "textRows": "Filas",
+ "textOk": "Ok",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Controller": {
"Main": {
diff --git a/apps/presentationeditor/mobile/locale/hu.json b/apps/presentationeditor/mobile/locale/hu.json
index 3b5823586..057fd1f93 100644
--- a/apps/presentationeditor/mobile/locale/hu.json
+++ b/apps/presentationeditor/mobile/locale/hu.json
@@ -59,7 +59,9 @@
"textColumns": "Oszlopok",
"textCopyCutPasteActions": "Másolás, kivágás és beillesztés",
"textDoNotShowAgain": "Ne mutassa újra",
- "textRows": "Sorok"
+ "textRows": "Sorok",
+ "textOk": "Ok",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Controller": {
"Main": {
diff --git a/apps/presentationeditor/mobile/locale/hy.json b/apps/presentationeditor/mobile/locale/hy.json
index ce2664f47..0cf68369e 100644
--- a/apps/presentationeditor/mobile/locale/hy.json
+++ b/apps/presentationeditor/mobile/locale/hy.json
@@ -59,7 +59,9 @@
"textColumns": "Սյունակներ",
"textCopyCutPasteActions": "Պատճենելու, կտրելու և փակցնելու գործողություններ",
"textDoNotShowAgain": "Այլևս ցույց չտալ",
- "textRows": "Տողեր"
+ "textRows": "Տողեր",
+ "textOk": "Ok",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Controller": {
"Main": {
diff --git a/apps/presentationeditor/mobile/locale/id.json b/apps/presentationeditor/mobile/locale/id.json
index 7f2876602..5ffed734d 100644
--- a/apps/presentationeditor/mobile/locale/id.json
+++ b/apps/presentationeditor/mobile/locale/id.json
@@ -59,7 +59,9 @@
"textColumns": "Kolom",
"textCopyCutPasteActions": "Salin, Potong dan Tempel",
"textDoNotShowAgain": "Jangan tampilkan lagi",
- "textRows": "Baris"
+ "textRows": "Baris",
+ "textOk": "Ok",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Controller": {
"Main": {
diff --git a/apps/presentationeditor/mobile/locale/it.json b/apps/presentationeditor/mobile/locale/it.json
index e2d3533ce..91385a0fd 100644
--- a/apps/presentationeditor/mobile/locale/it.json
+++ b/apps/presentationeditor/mobile/locale/it.json
@@ -59,7 +59,9 @@
"textColumns": "Colonne",
"textCopyCutPasteActions": "Funzioni di Copiare, Tagliare e Incollare",
"textDoNotShowAgain": "Non mostrare di nuovo",
- "textRows": "Righe"
+ "textRows": "Righe",
+ "textOk": "Ok",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Controller": {
"Main": {
diff --git a/apps/presentationeditor/mobile/locale/ja.json b/apps/presentationeditor/mobile/locale/ja.json
index 16f481751..82739f511 100644
--- a/apps/presentationeditor/mobile/locale/ja.json
+++ b/apps/presentationeditor/mobile/locale/ja.json
@@ -59,7 +59,9 @@
"textColumns": "列",
"textCopyCutPasteActions": "コピー,切り取り,貼り付けの操作",
"textDoNotShowAgain": "再度表示しない",
- "textRows": "行"
+ "textRows": "行",
+ "textOk": "Ok",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Controller": {
"Main": {
diff --git a/apps/presentationeditor/mobile/locale/ko.json b/apps/presentationeditor/mobile/locale/ko.json
index 102586407..79eeb9f00 100644
--- a/apps/presentationeditor/mobile/locale/ko.json
+++ b/apps/presentationeditor/mobile/locale/ko.json
@@ -59,7 +59,9 @@
"textColumns": "열",
"textCopyCutPasteActions": "복사, 잘라내기 및 붙여 넣기",
"textDoNotShowAgain": "다시 표시하지 않음",
- "textRows": "행"
+ "textRows": "행",
+ "textOk": "Ok",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Controller": {
"Main": {
diff --git a/apps/presentationeditor/mobile/locale/lo.json b/apps/presentationeditor/mobile/locale/lo.json
index c4bd64438..94c7d4f28 100644
--- a/apps/presentationeditor/mobile/locale/lo.json
+++ b/apps/presentationeditor/mobile/locale/lo.json
@@ -59,7 +59,9 @@
"textColumns": "ຖັນ",
"textCopyCutPasteActions": "ປະຕິບັດການ ສໍາເນົາ, ຕັດ ແລະ ວາງ",
"textDoNotShowAgain": "ບໍ່ສະແດງອີກ",
- "textRows": "ແຖວ"
+ "textRows": "ແຖວ",
+ "textOk": "Ok",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Controller": {
"Main": {
diff --git a/apps/presentationeditor/mobile/locale/lv.json b/apps/presentationeditor/mobile/locale/lv.json
index d1a9482c5..faab8267a 100644
--- a/apps/presentationeditor/mobile/locale/lv.json
+++ b/apps/presentationeditor/mobile/locale/lv.json
@@ -59,7 +59,9 @@
"textColumns": "Columns",
"textCopyCutPasteActions": "Copy, Cut and Paste Actions",
"textDoNotShowAgain": "Don't show again",
- "textRows": "Rows"
+ "textRows": "Rows",
+ "textOk": "Ok",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Controller": {
"Main": {
diff --git a/apps/presentationeditor/mobile/locale/ms.json b/apps/presentationeditor/mobile/locale/ms.json
index 52fa880dd..206b72539 100644
--- a/apps/presentationeditor/mobile/locale/ms.json
+++ b/apps/presentationeditor/mobile/locale/ms.json
@@ -59,7 +59,9 @@
"textColumns": "Lajur",
"textCopyCutPasteActions": "Tindakan Salin, Potong dan Tampal",
"textDoNotShowAgain": "Jangan tunjukkan semula",
- "textRows": "Baris"
+ "textRows": "Baris",
+ "textOk": "Ok",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Controller": {
"Main": {
diff --git a/apps/presentationeditor/mobile/locale/nb.json b/apps/presentationeditor/mobile/locale/nb.json
index d1a9482c5..faab8267a 100644
--- a/apps/presentationeditor/mobile/locale/nb.json
+++ b/apps/presentationeditor/mobile/locale/nb.json
@@ -59,7 +59,9 @@
"textColumns": "Columns",
"textCopyCutPasteActions": "Copy, Cut and Paste Actions",
"textDoNotShowAgain": "Don't show again",
- "textRows": "Rows"
+ "textRows": "Rows",
+ "textOk": "Ok",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Controller": {
"Main": {
diff --git a/apps/presentationeditor/mobile/locale/nl.json b/apps/presentationeditor/mobile/locale/nl.json
index 9f0bae9ed..3559f7782 100644
--- a/apps/presentationeditor/mobile/locale/nl.json
+++ b/apps/presentationeditor/mobile/locale/nl.json
@@ -59,7 +59,9 @@
"textColumns": "Kolommen",
"textCopyCutPasteActions": "Acties Kopiëren, Knippen en Plakken",
"textDoNotShowAgain": "Niet meer laten zien.",
- "textRows": "Rijen"
+ "textRows": "Rijen",
+ "textOk": "Ok",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Controller": {
"Main": {
diff --git a/apps/presentationeditor/mobile/locale/pl.json b/apps/presentationeditor/mobile/locale/pl.json
index d1a9482c5..faab8267a 100644
--- a/apps/presentationeditor/mobile/locale/pl.json
+++ b/apps/presentationeditor/mobile/locale/pl.json
@@ -59,7 +59,9 @@
"textColumns": "Columns",
"textCopyCutPasteActions": "Copy, Cut and Paste Actions",
"textDoNotShowAgain": "Don't show again",
- "textRows": "Rows"
+ "textRows": "Rows",
+ "textOk": "Ok",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Controller": {
"Main": {
diff --git a/apps/presentationeditor/mobile/locale/pt-PT.json b/apps/presentationeditor/mobile/locale/pt-PT.json
index ea61b5457..feda6697a 100644
--- a/apps/presentationeditor/mobile/locale/pt-PT.json
+++ b/apps/presentationeditor/mobile/locale/pt-PT.json
@@ -59,7 +59,9 @@
"textColumns": "Colunas",
"textCopyCutPasteActions": "Ações copiar, cortar e colar",
"textDoNotShowAgain": "Não mostrar novamente",
- "textRows": "Linhas"
+ "textRows": "Linhas",
+ "textOk": "Ok",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Controller": {
"Main": {
diff --git a/apps/presentationeditor/mobile/locale/pt.json b/apps/presentationeditor/mobile/locale/pt.json
index 4b7e9f91a..dfeee4346 100644
--- a/apps/presentationeditor/mobile/locale/pt.json
+++ b/apps/presentationeditor/mobile/locale/pt.json
@@ -59,7 +59,9 @@
"textColumns": "Colunas",
"textCopyCutPasteActions": "Copiar, Cortar e Colar",
"textDoNotShowAgain": "Não volte a aparecer",
- "textRows": "Linhas"
+ "textRows": "Linhas",
+ "textOk": "Ok",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Controller": {
"Main": {
diff --git a/apps/presentationeditor/mobile/locale/ro.json b/apps/presentationeditor/mobile/locale/ro.json
index fc25c8bb3..ab5096aa2 100644
--- a/apps/presentationeditor/mobile/locale/ro.json
+++ b/apps/presentationeditor/mobile/locale/ro.json
@@ -59,7 +59,9 @@
"textColumns": "Coloane",
"textCopyCutPasteActions": "Comenzile de copiere, decupare și lipire",
"textDoNotShowAgain": "Nu mai afișa",
- "textRows": "Rânduri"
+ "textRows": "Rânduri",
+ "textOk": "Ok",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Controller": {
"Main": {
diff --git a/apps/presentationeditor/mobile/locale/ru.json b/apps/presentationeditor/mobile/locale/ru.json
index bb35d00b4..b383835c1 100644
--- a/apps/presentationeditor/mobile/locale/ru.json
+++ b/apps/presentationeditor/mobile/locale/ru.json
@@ -59,7 +59,9 @@
"textColumns": "Столбцы",
"textCopyCutPasteActions": "Операции копирования, вырезания и вставки",
"textDoNotShowAgain": "Больше не показывать",
- "textRows": "Строки"
+ "textRows": "Строки",
+ "textOk": "Ok",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Controller": {
"Main": {
diff --git a/apps/presentationeditor/mobile/locale/sk.json b/apps/presentationeditor/mobile/locale/sk.json
index dc8de3f86..6d5dfae0e 100644
--- a/apps/presentationeditor/mobile/locale/sk.json
+++ b/apps/presentationeditor/mobile/locale/sk.json
@@ -59,7 +59,9 @@
"textColumns": "Stĺpce",
"textCopyCutPasteActions": "Akcia kopírovať, vystrihnúť a prilepiť",
"textDoNotShowAgain": "Nezobrazovať znova",
- "textRows": "Riadky"
+ "textRows": "Riadky",
+ "textOk": "Ok",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Controller": {
"Main": {
diff --git a/apps/presentationeditor/mobile/locale/sl.json b/apps/presentationeditor/mobile/locale/sl.json
index 7031e37bd..c0e68ef67 100644
--- a/apps/presentationeditor/mobile/locale/sl.json
+++ b/apps/presentationeditor/mobile/locale/sl.json
@@ -59,7 +59,9 @@
"menuViewComment": "View Comment",
"textCopyCutPasteActions": "Copy, Cut and Paste Actions",
"textDoNotShowAgain": "Don't show again",
- "textRows": "Rows"
+ "textRows": "Rows",
+ "textOk": "Ok",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"View": {
"Add": {
diff --git a/apps/presentationeditor/mobile/locale/tr.json b/apps/presentationeditor/mobile/locale/tr.json
index e07b5f19a..9cf2b4285 100644
--- a/apps/presentationeditor/mobile/locale/tr.json
+++ b/apps/presentationeditor/mobile/locale/tr.json
@@ -59,7 +59,9 @@
"textColumns": "Sütunlar",
"textCopyCutPasteActions": "Eylemleri Kopyala,Kes ve Yapıştır",
"textDoNotShowAgain": "Tekrar gösterme",
- "textRows": "Satırlar"
+ "textRows": "Satırlar",
+ "textOk": "Ok",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Controller": {
"Main": {
diff --git a/apps/presentationeditor/mobile/locale/uk.json b/apps/presentationeditor/mobile/locale/uk.json
index b14fe38a2..9c9ce558d 100644
--- a/apps/presentationeditor/mobile/locale/uk.json
+++ b/apps/presentationeditor/mobile/locale/uk.json
@@ -59,7 +59,9 @@
"textColumns": "Columns",
"textCopyCutPasteActions": "Copy, Cut and Paste Actions",
"textDoNotShowAgain": "Don't show again",
- "textRows": "Rows"
+ "textRows": "Rows",
+ "textOk": "Ok",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Controller": {
"Main": {
diff --git a/apps/presentationeditor/mobile/locale/vi.json b/apps/presentationeditor/mobile/locale/vi.json
index d1a9482c5..faab8267a 100644
--- a/apps/presentationeditor/mobile/locale/vi.json
+++ b/apps/presentationeditor/mobile/locale/vi.json
@@ -59,7 +59,9 @@
"textColumns": "Columns",
"textCopyCutPasteActions": "Copy, Cut and Paste Actions",
"textDoNotShowAgain": "Don't show again",
- "textRows": "Rows"
+ "textRows": "Rows",
+ "textOk": "Ok",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Controller": {
"Main": {
diff --git a/apps/presentationeditor/mobile/locale/zh-TW.json b/apps/presentationeditor/mobile/locale/zh-TW.json
index 03f4663eb..5a90faf73 100644
--- a/apps/presentationeditor/mobile/locale/zh-TW.json
+++ b/apps/presentationeditor/mobile/locale/zh-TW.json
@@ -59,7 +59,9 @@
"textColumns": "欄",
"textCopyCutPasteActions": "複製, 剪下, 與貼上之動作",
"textDoNotShowAgain": "不再顯示",
- "textRows": "行列"
+ "textRows": "行列",
+ "textOk": "Ok",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Controller": {
"Main": {
diff --git a/apps/presentationeditor/mobile/locale/zh.json b/apps/presentationeditor/mobile/locale/zh.json
index e4fbf0f1a..f8b013217 100644
--- a/apps/presentationeditor/mobile/locale/zh.json
+++ b/apps/presentationeditor/mobile/locale/zh.json
@@ -59,7 +59,9 @@
"textColumns": "列",
"textCopyCutPasteActions": "拷贝，剪切和粘贴操作",
"textDoNotShowAgain": "不要再显示",
- "textRows": "行"
+ "textRows": "行",
+ "textOk": "Ok",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Controller": {
"Main": {
diff --git a/apps/presentationeditor/mobile/src/controller/ContextMenu.jsx b/apps/presentationeditor/mobile/src/controller/ContextMenu.jsx
index 374ea55a1..38afb5611 100644
--- a/apps/presentationeditor/mobile/src/controller/ContextMenu.jsx
+++ b/apps/presentationeditor/mobile/src/controller/ContextMenu.jsx
@@ -180,14 +180,37 @@ class ContextMenu extends ContextMenuController {
}
openLink(url) {
- const api = Common.EditorApi.get();
- if (api.asc_getUrlType(url) > 0) {
- const newDocumentPage = window.open(url, '_blank');
- if (newDocumentPage) {
- newDocumentPage.focus();
+ if (url) {
+ const api = Common.EditorApi.get();
+ if (url.indexOf("ppaction://hlink")>=0) { // internal link
+ api.asc_GoToInternalHyperlink(url);
+ } else {
+ const type = api.asc_getUrlType(url);
+ if (type===AscCommon.c_oAscUrlType.Http || type===AscCommon.c_oAscUrlType.Email) {
+ const newDocumentPage = window.open(url, '_blank');
+ if (newDocumentPage) {
+ newDocumentPage.focus();
+ }
+ } else {
+ const { t } = this.props;
+ const _t = t("ContextMenu", { returnObjects: true });
+ f7.dialog.create({
+ title: t('View.Settings', {returnObjects: true}).notcriticalErrorTitle,
+ text : _t.txtWarnUrl,
+ buttons: [{
+ text: t('View.Settings', {returnObjects: true}).textOk,
+ bold: true,
+ onClick: () => {
+ const newDocumentPage = window.open(url, '_blank');
+ if (newDocumentPage) {
+ newDocumentPage.focus();
+ }
+ }
+ },
+ { text: _t.menuCancel }]
+ }).open();
+ }
}
- } else {
- api.asc_GoToInternalHyperlink(url);
}
}
diff --git a/apps/presentationeditor/mobile/src/controller/add/AddLink.jsx b/apps/presentationeditor/mobile/src/controller/add/AddLink.jsx
index 554ebc187..43c7c84aa 100644
--- a/apps/presentationeditor/mobile/src/controller/add/AddLink.jsx
+++ b/apps/presentationeditor/mobile/src/controller/add/AddLink.jsx
@@ -40,8 +40,7 @@ class AddLinkController extends Component {
if (type == c_oHyperlinkType.WebLink) {
let url = linkInfo.url;
const urltype = api.asc_getUrlType(url.trim());
- const isEmail = (urltype == 2);
- if (urltype < 1) {
+ if (urltype===AscCommon.c_oAscUrlType.Invalid) {
f7.dialog.create({
title: _t.notcriticalErrorTitle,
text: _t.txtNotUrl,
@@ -55,8 +54,8 @@ class AddLinkController extends Component {
}
url = url.replace(/^\s+|\s+$/g, '');
- if (!/(((^https?)|(^ftp)):\/\/)|(^mailto:)/i.test(url))
- url = (isEmail ? 'mailto:' : 'http://' ) + url;
+ if (urltype!==AscCommon.c_oAscUrlType.Unsafe && !/(((^https?)|(^ftp)):\/\/)|(^mailto:)/i.test(url))
+ url = (urltype===AscCommon.c_oAscUrlType.Email ? 'mailto:' : 'http://' ) + url;
url = url.replace(new RegExp("%20", 'g'), " ");
props.put_Value(url);
diff --git a/apps/presentationeditor/mobile/src/controller/edit/EditLink.jsx b/apps/presentationeditor/mobile/src/controller/edit/EditLink.jsx
index 037916bd7..21fb1e0cd 100644
--- a/apps/presentationeditor/mobile/src/controller/edit/EditLink.jsx
+++ b/apps/presentationeditor/mobile/src/controller/edit/EditLink.jsx
@@ -97,8 +97,7 @@ class EditLinkController extends Component {
if (type == c_oHyperlinkType.WebLink) {
let url = linkInfo.url;
const urltype = api.asc_getUrlType(url.trim());
- const isEmail = (urltype == 2);
- if (urltype < 1) {
+ if (urltype===AscCommon.c_oAscUrlType.Invalid) {
f7.dialog.create({
title: t('View.Edit.notcriticalErrorTitle'),
text: t('View.Edit.textNotUrl'),
@@ -113,8 +112,8 @@ class EditLinkController extends Component {
}
url = url.replace(/^\s+|\s+$/g, '');
- if (!/(((^https?)|(^ftp)):\/\/)|(^mailto:)/i.test(url))
- url = (isEmail ? 'mailto:' : 'http://' ) + url;
+ if (urltype!==AscCommon.c_oAscUrlType.Unsafe && !/(((^https?)|(^ftp)):\/\/)|(^mailto:)/i.test(url))
+ url = (urltype===AscCommon.c_oAscUrlType.Email ? 'mailto:' : 'http://' ) + url;
url = url.replace(new RegExp("%20", 'g'), " ");
props.put_Value(url);
diff --git a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
index be63a942a..43ddd22eb 100644
--- a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
+++ b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
@@ -1662,7 +1662,8 @@ define([
});
return;
}
- if (this.api.asc_getUrlType(url)>0)
+ var type = this.api.asc_getUrlType(url);
+ if (type===AscCommon.c_oAscUrlType.Http || type===AscCommon.c_oAscUrlType.Email)
window.open(url, '_blank');
else
Common.UI.warning({
diff --git a/apps/spreadsheeteditor/main/app/view/HyperlinkSettingsDialog.js b/apps/spreadsheeteditor/main/app/view/HyperlinkSettingsDialog.js
index f9a263282..9ae19327e 100644
--- a/apps/spreadsheeteditor/main/app/view/HyperlinkSettingsDialog.js
+++ b/apps/spreadsheeteditor/main/app/view/HyperlinkSettingsDialog.js
@@ -107,6 +107,7 @@ define([
this.api = this.options.api;
this.appOptions = options.appOptions;
this.dataRangeValid = '';
+ this.urlType = AscCommon.c_oAscUrlType.Invalid;
Common.UI.Window.prototype.initialize.call(this, this.options);
},
@@ -144,9 +145,8 @@ define([
var trimmed = $.trim(value);
if (me.api.asc_getFullHyperlinkLength(trimmed)>2083) return me.txtSizeLimit;
- var urltype = me.api.asc_getUrlType(trimmed);
- me.isEmail = (urltype==2);
- return (urltype>0) ? true : me.txtNotUrl;
+ me.urlType = me.api.asc_getUrlType(trimmed);
+ return (me.urlType!==AscCommon.c_oAscUrlType.Invalid) ? true : me.txtNotUrl;
}
});
me.inputUrl._input.on('input', function (e) {
@@ -326,8 +326,8 @@ define([
}
} else {
var url = this.inputUrl.getValue().replace(/^\s+|\s+$/g,'');
- if (! /(((^https?)|(^ftp)):\/\/)|(^mailto:)/i.test(url) )
- url = ( (this.isEmail) ? 'mailto:' : 'http://' ) + url;
+ if (this.urlType!==AscCommon.c_oAscUrlType.Unsafe && ! /(((^https?)|(^ftp)):\/\/)|(^mailto:)/i.test(url) )
+ url = ( (this.urlType==AscCommon.c_oAscUrlType.Email) ? 'mailto:' : 'http://' ) + url;
url = url.replace(new RegExp("%20",'g')," ");
props.asc_setHyperlinkUrl(url);
def_display = url;
diff --git a/apps/spreadsheeteditor/mobile/locale/az.json b/apps/spreadsheeteditor/mobile/locale/az.json
index 8e43a6615..2b2471b77 100644
--- a/apps/spreadsheeteditor/mobile/locale/az.json
+++ b/apps/spreadsheeteditor/mobile/locale/az.json
@@ -63,7 +63,9 @@
"notcriticalErrorTitle": "Xəbərdarlıq",
"textCopyCutPasteActions": "Kopyalama, Kəsmə və Yapışdırma Əməliyyatları",
"textDoNotShowAgain": "Bir daha göstərmə",
- "warnMergeLostData": "Birləşdirilmiş xanada yalnız yuxarı sol xanadakı məlumatlar qalacaq.
Davam etmək istədiyinizdən əminsiniz?"
+ "warnMergeLostData": "Birləşdirilmiş xanada yalnız yuxarı sol xanadakı məlumatlar qalacaq.
Davam etmək istədiyinizdən əminsiniz?",
+ "textOk": "Ok",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Controller": {
"Main": {
diff --git a/apps/spreadsheeteditor/mobile/locale/be.json b/apps/spreadsheeteditor/mobile/locale/be.json
index e09b4bfb2..028159204 100644
--- a/apps/spreadsheeteditor/mobile/locale/be.json
+++ b/apps/spreadsheeteditor/mobile/locale/be.json
@@ -63,7 +63,9 @@
"notcriticalErrorTitle": "Warning",
"textCopyCutPasteActions": "Copy, Cut and Paste Actions",
"textDoNotShowAgain": "Don't show again",
- "warnMergeLostData": "Only the data from the upper-left cell will remain in the merged cell.
Are you sure you want to continue?"
+ "warnMergeLostData": "Only the data from the upper-left cell will remain in the merged cell.
Are you sure you want to continue?",
+ "textOk": "Ok",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Controller": {
"Main": {
diff --git a/apps/spreadsheeteditor/mobile/locale/bg.json b/apps/spreadsheeteditor/mobile/locale/bg.json
index bee870aca..0bc31c3ca 100644
--- a/apps/spreadsheeteditor/mobile/locale/bg.json
+++ b/apps/spreadsheeteditor/mobile/locale/bg.json
@@ -63,7 +63,9 @@
"textCopyCutPasteActions": "Copy, Cut and Paste Actions",
"textDoNotShowAgain": "Don't show again",
"warnMergeLostData": "The operation can destroy data in the selected cells. Continue?",
- "errorInvalidLink": "The link reference does not exist. Please correct the link or delete it."
+ "errorInvalidLink": "The link reference does not exist. Please correct the link or delete it.",
+ "textOk": "Ok",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Controller": {
"Main": {
diff --git a/apps/spreadsheeteditor/mobile/locale/ca.json b/apps/spreadsheeteditor/mobile/locale/ca.json
index 7c35d2de4..1a8187524 100644
--- a/apps/spreadsheeteditor/mobile/locale/ca.json
+++ b/apps/spreadsheeteditor/mobile/locale/ca.json
@@ -63,7 +63,9 @@
"notcriticalErrorTitle": "Advertiment",
"textCopyCutPasteActions": "Accions de copia, talla i enganxa ",
"textDoNotShowAgain": "No ho mostris més",
- "warnMergeLostData": "Només les dades de la cel·la superior esquerra romandran a la cel·la combinada.
Voleu continuar?"
+ "warnMergeLostData": "Només les dades de la cel·la superior esquerra romandran a la cel·la combinada.
Voleu continuar?",
+ "textOk": "Ok",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Controller": {
"Main": {
diff --git a/apps/spreadsheeteditor/mobile/locale/cs.json b/apps/spreadsheeteditor/mobile/locale/cs.json
index 625945a86..50dbefcd2 100644
--- a/apps/spreadsheeteditor/mobile/locale/cs.json
+++ b/apps/spreadsheeteditor/mobile/locale/cs.json
@@ -63,7 +63,9 @@
"notcriticalErrorTitle": "Varování",
"textCopyCutPasteActions": "Akce kopírovat, vyjmout a vložit",
"textDoNotShowAgain": "Nezobrazovat znovu",
- "warnMergeLostData": "Ve sloučené buňce budou zachována pouze data z původní levé horní buňky.
Opravdu chcete pokračovat?"
+ "warnMergeLostData": "Ve sloučené buňce budou zachována pouze data z původní levé horní buňky.
Opravdu chcete pokračovat?",
+ "textOk": "Ok",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Controller": {
"Main": {
diff --git a/apps/spreadsheeteditor/mobile/locale/da.json b/apps/spreadsheeteditor/mobile/locale/da.json
index 17573a1e7..ea8dcbcc3 100644
--- a/apps/spreadsheeteditor/mobile/locale/da.json
+++ b/apps/spreadsheeteditor/mobile/locale/da.json
@@ -63,7 +63,9 @@
"menuUnmerge": "Unmerge",
"menuUnwrap": "Unwrap",
"menuViewComment": "View Comment",
- "notcriticalErrorTitle": "Warning"
+ "notcriticalErrorTitle": "Warning",
+ "textOk": "Ok",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Controller": {
"Main": {
diff --git a/apps/spreadsheeteditor/mobile/locale/de.json b/apps/spreadsheeteditor/mobile/locale/de.json
index b9678a8a5..29c0f4bd9 100644
--- a/apps/spreadsheeteditor/mobile/locale/de.json
+++ b/apps/spreadsheeteditor/mobile/locale/de.json
@@ -63,7 +63,9 @@
"notcriticalErrorTitle": "Warnung",
"textCopyCutPasteActions": "Kopieren, Ausschneiden und Einfügen",
"textDoNotShowAgain": "Nicht mehr anzeigen",
- "warnMergeLostData": "Nur die Daten aus der oberen linken Zelle bleiben nach der Vereinigung.
Möchten Sie wirklich fortsetzen?"
+ "warnMergeLostData": "Nur die Daten aus der oberen linken Zelle bleiben nach der Vereinigung.
Möchten Sie wirklich fortsetzen?",
+ "textOk": "Ok",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Controller": {
"Main": {
diff --git a/apps/spreadsheeteditor/mobile/locale/el.json b/apps/spreadsheeteditor/mobile/locale/el.json
index e668ebc20..08929dfce 100644
--- a/apps/spreadsheeteditor/mobile/locale/el.json
+++ b/apps/spreadsheeteditor/mobile/locale/el.json
@@ -63,7 +63,9 @@
"notcriticalErrorTitle": "Προειδοποίηση",
"textCopyCutPasteActions": "Ενέργειες Αντιγραφής, Αποκοπής και Επικόλλησης",
"textDoNotShowAgain": "Να μην εμφανιστεί ξανά",
- "warnMergeLostData": "Μόνο τα δεδομένα από το επάνω αριστερό κελί θα παραμείνουν στο συγχωνευμένο κελί.
Είστε σίγουροι ότι θέλετε να συνεχίσετε;"
+ "warnMergeLostData": "Μόνο τα δεδομένα από το επάνω αριστερό κελί θα παραμείνουν στο συγχωνευμένο κελί.
Είστε σίγουροι ότι θέλετε να συνεχίσετε;",
+ "textOk": "Ok",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Controller": {
"Main": {
diff --git a/apps/spreadsheeteditor/mobile/locale/en.json b/apps/spreadsheeteditor/mobile/locale/en.json
index 48e9e2910..11b160f54 100644
--- a/apps/spreadsheeteditor/mobile/locale/en.json
+++ b/apps/spreadsheeteditor/mobile/locale/en.json
@@ -63,7 +63,9 @@
"notcriticalErrorTitle": "Warning",
"textCopyCutPasteActions": "Copy, Cut and Paste Actions",
"textDoNotShowAgain": "Don't show again",
- "warnMergeLostData": "Only the data from the upper-left cell will remain in the merged cell.
Are you sure you want to continue?"
+ "warnMergeLostData": "Only the data from the upper-left cell will remain in the merged cell.
Are you sure you want to continue?",
+ "textOk": "Ok",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Controller": {
"Main": {
diff --git a/apps/spreadsheeteditor/mobile/locale/es.json b/apps/spreadsheeteditor/mobile/locale/es.json
index 0103cda42..011be5f5f 100644
--- a/apps/spreadsheeteditor/mobile/locale/es.json
+++ b/apps/spreadsheeteditor/mobile/locale/es.json
@@ -63,7 +63,9 @@
"notcriticalErrorTitle": "Advertencia",
"textCopyCutPasteActions": "Acciones de Copiar, Cortar y Pegar",
"textDoNotShowAgain": "No mostrar de nuevo",
- "warnMergeLostData": "En la celda unida permanecerán sólo los datos de la celda de la esquina superior izquierda.
Está seguro de que quiere continuar?"
+ "warnMergeLostData": "En la celda unida permanecerán sólo los datos de la celda de la esquina superior izquierda.
Está seguro de que quiere continuar?",
+ "textOk": "Ok",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Controller": {
"Main": {
diff --git a/apps/spreadsheeteditor/mobile/locale/eu.json b/apps/spreadsheeteditor/mobile/locale/eu.json
index b1cacbfd3..8464e8c51 100644
--- a/apps/spreadsheeteditor/mobile/locale/eu.json
+++ b/apps/spreadsheeteditor/mobile/locale/eu.json
@@ -63,7 +63,9 @@
"notcriticalErrorTitle": "Abisua",
"textCopyCutPasteActions": "Kopiatu, ebaki eta itsatsi ekintzak",
"textDoNotShowAgain": "Ez erakutsi berriro",
- "warnMergeLostData": "Goren-ezkerreko gelaxkako datuak bakarrik mantenduko dira elkartutako gelaxkan.
Seguru zaude jarraitu nahi duzula?"
+ "warnMergeLostData": "Goren-ezkerreko gelaxkako datuak bakarrik mantenduko dira elkartutako gelaxkan.
Seguru zaude jarraitu nahi duzula?",
+ "textOk": "Ok",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Controller": {
"Main": {
diff --git a/apps/spreadsheeteditor/mobile/locale/fr.json b/apps/spreadsheeteditor/mobile/locale/fr.json
index 37a75904e..e696e6de5 100644
--- a/apps/spreadsheeteditor/mobile/locale/fr.json
+++ b/apps/spreadsheeteditor/mobile/locale/fr.json
@@ -63,7 +63,9 @@
"notcriticalErrorTitle": "Avertissement",
"textCopyCutPasteActions": "Fonctions de Copier, Couper et Coller",
"textDoNotShowAgain": "Ne plus afficher",
- "warnMergeLostData": "Seulement les données de la cellule supérieure gauche seront conservées dans la cellule fusionnée.
Êtes-vous sûr de vouloir continuer ?"
+ "warnMergeLostData": "Seulement les données de la cellule supérieure gauche seront conservées dans la cellule fusionnée.
Êtes-vous sûr de vouloir continuer ?",
+ "textOk": "Ok",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Controller": {
"Main": {
diff --git a/apps/spreadsheeteditor/mobile/locale/gl.json b/apps/spreadsheeteditor/mobile/locale/gl.json
index ad26a185e..9b38f74e0 100644
--- a/apps/spreadsheeteditor/mobile/locale/gl.json
+++ b/apps/spreadsheeteditor/mobile/locale/gl.json
@@ -63,7 +63,9 @@
"notcriticalErrorTitle": "Aviso",
"textCopyCutPasteActions": "Accións de copiar, cortar e pegar",
"textDoNotShowAgain": "Non amosar de novo",
- "warnMergeLostData": "Na celda unida permanecerán só os datos da celda da esquina superior esquerda.
Ten a certeza de que quere continuar?"
+ "warnMergeLostData": "Na celda unida permanecerán só os datos da celda da esquina superior esquerda.
Ten a certeza de que quere continuar?",
+ "textOk": "Ok",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Controller": {
"Main": {
diff --git a/apps/spreadsheeteditor/mobile/locale/hu.json b/apps/spreadsheeteditor/mobile/locale/hu.json
index a459a8f82..c152b38ef 100644
--- a/apps/spreadsheeteditor/mobile/locale/hu.json
+++ b/apps/spreadsheeteditor/mobile/locale/hu.json
@@ -63,7 +63,9 @@
"notcriticalErrorTitle": "Figyelmeztetés",
"textCopyCutPasteActions": "Másolás, kivágás és beillesztés",
"textDoNotShowAgain": "Ne mutassa újra",
- "warnMergeLostData": "Csak a bal felső cellából származó adatok maradnak az egyesített cellában.
Biztosan folytatni szeretné?"
+ "warnMergeLostData": "Csak a bal felső cellából származó adatok maradnak az egyesített cellában.
Biztosan folytatni szeretné?",
+ "textOk": "Ok",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Controller": {
"Main": {
diff --git a/apps/spreadsheeteditor/mobile/locale/hy.json b/apps/spreadsheeteditor/mobile/locale/hy.json
index 4d74162d8..6ab418d8d 100644
--- a/apps/spreadsheeteditor/mobile/locale/hy.json
+++ b/apps/spreadsheeteditor/mobile/locale/hy.json
@@ -63,7 +63,9 @@
"notcriticalErrorTitle": "Զգուշացում",
"textCopyCutPasteActions": "Պատճենելու, կտրելու և փակցնելու գործողություններ",
"textDoNotShowAgain": "Այլևս ցույց չտալ",
- "warnMergeLostData": "Գործողությունը կարող է ոչնչացնել ընտրված վանդակների տվյալները։
Շարունակե՞լ։"
+ "warnMergeLostData": "Գործողությունը կարող է ոչնչացնել ընտրված վանդակների տվյալները։
Շարունակե՞լ։",
+ "textOk": "Ok",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Controller": {
"Main": {
diff --git a/apps/spreadsheeteditor/mobile/locale/id.json b/apps/spreadsheeteditor/mobile/locale/id.json
index 5027b10e5..cb50a90df 100644
--- a/apps/spreadsheeteditor/mobile/locale/id.json
+++ b/apps/spreadsheeteditor/mobile/locale/id.json
@@ -63,7 +63,9 @@
"notcriticalErrorTitle": "Peringatan",
"textCopyCutPasteActions": "Salin, Potong dan Tempel",
"textDoNotShowAgain": "Jangan tampilkan lagi",
- "warnMergeLostData": "Hanya data dari sel atas-kiri akan tetap berada di sel merging.
Apakah Anda ingin melanjutkan?"
+ "warnMergeLostData": "Hanya data dari sel atas-kiri akan tetap berada di sel merging.
Apakah Anda ingin melanjutkan?",
+ "textOk": "Ok",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Controller": {
"Main": {
diff --git a/apps/spreadsheeteditor/mobile/locale/it.json b/apps/spreadsheeteditor/mobile/locale/it.json
index 214ac527b..5fc2d4587 100644
--- a/apps/spreadsheeteditor/mobile/locale/it.json
+++ b/apps/spreadsheeteditor/mobile/locale/it.json
@@ -63,7 +63,9 @@
"notcriticalErrorTitle": "Avvertimento",
"textCopyCutPasteActions": "Funzioni di Copiare, Tagliare e Incollare",
"textDoNotShowAgain": "Non mostrare di nuovo",
- "warnMergeLostData": "Solo i dati dalla cella sinistra superiore rimangono nella cella unita.
Sei sicuro di voler continuare?"
+ "warnMergeLostData": "Solo i dati dalla cella sinistra superiore rimangono nella cella unita.
Sei sicuro di voler continuare?",
+ "textOk": "Ok",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Controller": {
"Main": {
diff --git a/apps/spreadsheeteditor/mobile/locale/ja.json b/apps/spreadsheeteditor/mobile/locale/ja.json
index 7006ffe1e..e161e59f8 100644
--- a/apps/spreadsheeteditor/mobile/locale/ja.json
+++ b/apps/spreadsheeteditor/mobile/locale/ja.json
@@ -63,7 +63,9 @@
"notcriticalErrorTitle": " 警告",
"textCopyCutPasteActions": "コピー,切り取り,貼り付けの操作",
"textDoNotShowAgain": "再度表示しない",
- "warnMergeLostData": "マージされたセルに左上のセルからのデータのみが残ります。
続行してもよろしいです？"
+ "warnMergeLostData": "マージされたセルに左上のセルからのデータのみが残ります。
続行してもよろしいです？",
+ "textOk": "Ok",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Controller": {
"Main": {
diff --git a/apps/spreadsheeteditor/mobile/locale/ko.json b/apps/spreadsheeteditor/mobile/locale/ko.json
index 9cb13c1d2..855c71fcc 100644
--- a/apps/spreadsheeteditor/mobile/locale/ko.json
+++ b/apps/spreadsheeteditor/mobile/locale/ko.json
@@ -63,7 +63,9 @@
"notcriticalErrorTitle": "경고",
"textCopyCutPasteActions": "작업 복사, 잘라 내기 및 붙여 넣기",
"textDoNotShowAgain": "다시 표시하지 않음",
- "warnMergeLostData": "왼쪽 위 셀의 데이터 만 병합 된 셀에 남아 있습니다.
계속 하시겠습니까?"
+ "warnMergeLostData": "왼쪽 위 셀의 데이터 만 병합 된 셀에 남아 있습니다.
계속 하시겠습니까?",
+ "textOk": "Ok",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Controller": {
"Main": {
diff --git a/apps/spreadsheeteditor/mobile/locale/lo.json b/apps/spreadsheeteditor/mobile/locale/lo.json
index e989e9491..270b60024 100644
--- a/apps/spreadsheeteditor/mobile/locale/lo.json
+++ b/apps/spreadsheeteditor/mobile/locale/lo.json
@@ -63,7 +63,9 @@
"notcriticalErrorTitle": "ເຕືອນ",
"textCopyCutPasteActions": "ປະຕິບັດການ ສໍາເນົາ, ຕັດ ແລະ ວາງ",
"textDoNotShowAgain": "ບໍ່ສະແດງອີກ",
- "warnMergeLostData": "ສະເພາະຂໍ້ມູນຈາກເຊວດ້ານຊ້າຍເທິງທີ່ຈະຢູ່ໃນເຊວຮ່ວມ.
ທ່ານຕ້ອງການດຳເນີນການຕໍ່ບໍ່?"
+ "warnMergeLostData": "ສະເພາະຂໍ້ມູນຈາກເຊວດ້ານຊ້າຍເທິງທີ່ຈະຢູ່ໃນເຊວຮ່ວມ.
ທ່ານຕ້ອງການດຳເນີນການຕໍ່ບໍ່?",
+ "textOk": "Ok",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Controller": {
"Main": {
diff --git a/apps/spreadsheeteditor/mobile/locale/lv.json b/apps/spreadsheeteditor/mobile/locale/lv.json
index d0f75fb08..c85a089b5 100644
--- a/apps/spreadsheeteditor/mobile/locale/lv.json
+++ b/apps/spreadsheeteditor/mobile/locale/lv.json
@@ -63,7 +63,9 @@
"textCopyCutPasteActions": "Copy, Cut and Paste Actions",
"textDoNotShowAgain": "Don't show again",
"warnMergeLostData": "The operation can destroy data in the selected cells. Continue?",
- "errorInvalidLink": "The link reference does not exist. Please correct the link or delete it."
+ "errorInvalidLink": "The link reference does not exist. Please correct the link or delete it.",
+ "textOk": "Ok",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Controller": {
"Main": {
diff --git a/apps/spreadsheeteditor/mobile/locale/ms.json b/apps/spreadsheeteditor/mobile/locale/ms.json
index 5307e4e81..b42ed33ff 100644
--- a/apps/spreadsheeteditor/mobile/locale/ms.json
+++ b/apps/spreadsheeteditor/mobile/locale/ms.json
@@ -63,7 +63,9 @@
"notcriticalErrorTitle": "Amaran",
"textCopyCutPasteActions": "Tindakan Salin, Potong dan Tampal",
"textDoNotShowAgain": "Jangan tunjukkan semula",
- "warnMergeLostData": "Hanya data dari sel kiri-atas akan kekal dalam sel dicantum.
Adakah anda pasti mahu meneruskan?"
+ "warnMergeLostData": "Hanya data dari sel kiri-atas akan kekal dalam sel dicantum.
Adakah anda pasti mahu meneruskan?",
+ "textOk": "Ok",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Controller": {
"Main": {
diff --git a/apps/spreadsheeteditor/mobile/locale/nb.json b/apps/spreadsheeteditor/mobile/locale/nb.json
index d0f75fb08..c85a089b5 100644
--- a/apps/spreadsheeteditor/mobile/locale/nb.json
+++ b/apps/spreadsheeteditor/mobile/locale/nb.json
@@ -63,7 +63,9 @@
"textCopyCutPasteActions": "Copy, Cut and Paste Actions",
"textDoNotShowAgain": "Don't show again",
"warnMergeLostData": "The operation can destroy data in the selected cells. Continue?",
- "errorInvalidLink": "The link reference does not exist. Please correct the link or delete it."
+ "errorInvalidLink": "The link reference does not exist. Please correct the link or delete it.",
+ "textOk": "Ok",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Controller": {
"Main": {
diff --git a/apps/spreadsheeteditor/mobile/locale/nl.json b/apps/spreadsheeteditor/mobile/locale/nl.json
index afec6da64..3f57f834e 100644
--- a/apps/spreadsheeteditor/mobile/locale/nl.json
+++ b/apps/spreadsheeteditor/mobile/locale/nl.json
@@ -63,7 +63,9 @@
"notcriticalErrorTitle": "Waarschuwing",
"textCopyCutPasteActions": "Acties Kopiëren, Knippen en Plakken",
"textDoNotShowAgain": "Niet meer laten zien.",
- "warnMergeLostData": "Alleen de gegevens in de cel linksboven blijven behouden in de samengevoegde cel.
Wilt u doorgaan?"
+ "warnMergeLostData": "Alleen de gegevens in de cel linksboven blijven behouden in de samengevoegde cel.
Wilt u doorgaan?",
+ "textOk": "Ok",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Controller": {
"Main": {
diff --git a/apps/spreadsheeteditor/mobile/locale/pl.json b/apps/spreadsheeteditor/mobile/locale/pl.json
index d0f75fb08..c85a089b5 100644
--- a/apps/spreadsheeteditor/mobile/locale/pl.json
+++ b/apps/spreadsheeteditor/mobile/locale/pl.json
@@ -63,7 +63,9 @@
"textCopyCutPasteActions": "Copy, Cut and Paste Actions",
"textDoNotShowAgain": "Don't show again",
"warnMergeLostData": "The operation can destroy data in the selected cells. Continue?",
- "errorInvalidLink": "The link reference does not exist. Please correct the link or delete it."
+ "errorInvalidLink": "The link reference does not exist. Please correct the link or delete it.",
+ "textOk": "Ok",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Controller": {
"Main": {
diff --git a/apps/spreadsheeteditor/mobile/locale/pt-PT.json b/apps/spreadsheeteditor/mobile/locale/pt-PT.json
index a6f334df1..f6bf36978 100644
--- a/apps/spreadsheeteditor/mobile/locale/pt-PT.json
+++ b/apps/spreadsheeteditor/mobile/locale/pt-PT.json
@@ -63,7 +63,9 @@
"notcriticalErrorTitle": "Aviso",
"textCopyCutPasteActions": "Ações copiar, cortar e colar",
"textDoNotShowAgain": "Não mostrar novamente",
- "warnMergeLostData": "Apenas os dados da célula superior esquerda permanecerá na célula mesclada.
Você tem certeza de que deseja continuar? "
+ "warnMergeLostData": "Apenas os dados da célula superior esquerda permanecerá na célula mesclada.
Você tem certeza de que deseja continuar? ",
+ "textOk": "Ok",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Controller": {
"Main": {
diff --git a/apps/spreadsheeteditor/mobile/locale/pt.json b/apps/spreadsheeteditor/mobile/locale/pt.json
index 697e912c2..0898e43ba 100644
--- a/apps/spreadsheeteditor/mobile/locale/pt.json
+++ b/apps/spreadsheeteditor/mobile/locale/pt.json
@@ -63,7 +63,9 @@
"notcriticalErrorTitle": "Aviso",
"textCopyCutPasteActions": "Copiar, Cortar e Colar",
"textDoNotShowAgain": "Não volte a aparecer",
- "warnMergeLostData": "Apenas os dados da célula superior esquerda permanecerá na célula mesclada.
Você tem certeza de que deseja continuar? "
+ "warnMergeLostData": "Apenas os dados da célula superior esquerda permanecerá na célula mesclada.
Você tem certeza de que deseja continuar? ",
+ "textOk": "Ok",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Controller": {
"Main": {
diff --git a/apps/spreadsheeteditor/mobile/locale/ro.json b/apps/spreadsheeteditor/mobile/locale/ro.json
index 5c97d4b49..5a320a70f 100644
--- a/apps/spreadsheeteditor/mobile/locale/ro.json
+++ b/apps/spreadsheeteditor/mobile/locale/ro.json
@@ -63,7 +63,9 @@
"notcriticalErrorTitle": "Avertisment",
"textCopyCutPasteActions": "Comenzile de copiere, decupare și lipire",
"textDoNotShowAgain": "Nu mai afișa",
- "warnMergeLostData": "În celula îmbinată se afișează numai conținutul celulei din stânga sus.
Sunteți sigur că doriți să continuați?"
+ "warnMergeLostData": "În celula îmbinată se afișează numai conținutul celulei din stânga sus.
Sunteți sigur că doriți să continuați?",
+ "textOk": "Ok",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Controller": {
"Main": {
diff --git a/apps/spreadsheeteditor/mobile/locale/ru.json b/apps/spreadsheeteditor/mobile/locale/ru.json
index 58f7f107f..ede971e08 100644
--- a/apps/spreadsheeteditor/mobile/locale/ru.json
+++ b/apps/spreadsheeteditor/mobile/locale/ru.json
@@ -63,7 +63,9 @@
"notcriticalErrorTitle": "Внимание",
"textCopyCutPasteActions": "Операции копирования, вырезания и вставки",
"textDoNotShowAgain": "Больше не показывать",
- "warnMergeLostData": "В объединенной ячейке останутся только данные из левой верхней ячейки.
Вы действительно хотите продолжить?"
+ "warnMergeLostData": "В объединенной ячейке останутся только данные из левой верхней ячейки.
Вы действительно хотите продолжить?",
+ "textOk": "Ok",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Controller": {
"Main": {
diff --git a/apps/spreadsheeteditor/mobile/locale/sk.json b/apps/spreadsheeteditor/mobile/locale/sk.json
index 559d91d3b..320ae932d 100644
--- a/apps/spreadsheeteditor/mobile/locale/sk.json
+++ b/apps/spreadsheeteditor/mobile/locale/sk.json
@@ -63,7 +63,9 @@
"notcriticalErrorTitle": "Upozornenie",
"textCopyCutPasteActions": "Kopírovať, vystrihnúť a prilepiť",
"textDoNotShowAgain": "Nezobrazovať znova",
- "warnMergeLostData": "Iba údaje z ľavej hornej bunky zostanú v zlúčenej bunke.
Ste si istý, že chcete pokračovať?"
+ "warnMergeLostData": "Iba údaje z ľavej hornej bunky zostanú v zlúčenej bunke.
Ste si istý, že chcete pokračovať?",
+ "textOk": "Ok",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Controller": {
"Main": {
diff --git a/apps/spreadsheeteditor/mobile/locale/sl.json b/apps/spreadsheeteditor/mobile/locale/sl.json
index d0f75fb08..c85a089b5 100644
--- a/apps/spreadsheeteditor/mobile/locale/sl.json
+++ b/apps/spreadsheeteditor/mobile/locale/sl.json
@@ -63,7 +63,9 @@
"textCopyCutPasteActions": "Copy, Cut and Paste Actions",
"textDoNotShowAgain": "Don't show again",
"warnMergeLostData": "The operation can destroy data in the selected cells. Continue?",
- "errorInvalidLink": "The link reference does not exist. Please correct the link or delete it."
+ "errorInvalidLink": "The link reference does not exist. Please correct the link or delete it.",
+ "textOk": "Ok",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Controller": {
"Main": {
diff --git a/apps/spreadsheeteditor/mobile/locale/tr.json b/apps/spreadsheeteditor/mobile/locale/tr.json
index 612a6409b..a46d37227 100644
--- a/apps/spreadsheeteditor/mobile/locale/tr.json
+++ b/apps/spreadsheeteditor/mobile/locale/tr.json
@@ -63,7 +63,9 @@
"notcriticalErrorTitle": "Uyarı",
"textCopyCutPasteActions": "Kes, Kopyala ve Yapıştır Aksiyonları",
"textDoNotShowAgain": "Tekrar gösterme",
- "warnMergeLostData": "Sadece üst sol hücredeki veri birleştirilmiş hücrede kalacaktır.
Devam etmek istediğinizden emin misiniz?"
+ "warnMergeLostData": "Sadece üst sol hücredeki veri birleştirilmiş hücrede kalacaktır.
Devam etmek istediğinizden emin misiniz?",
+ "textOk": "Ok",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Controller": {
"Main": {
diff --git a/apps/spreadsheeteditor/mobile/locale/uk.json b/apps/spreadsheeteditor/mobile/locale/uk.json
index e2eb95210..2c2bc8ac4 100644
--- a/apps/spreadsheeteditor/mobile/locale/uk.json
+++ b/apps/spreadsheeteditor/mobile/locale/uk.json
@@ -163,7 +163,9 @@
"notcriticalErrorTitle": "Warning",
"textCopyCutPasteActions": "Copy, Cut and Paste Actions",
"textDoNotShowAgain": "Don't show again",
- "warnMergeLostData": "Only the data from the upper-left cell will remain in the merged cell.
Are you sure you want to continue?"
+ "warnMergeLostData": "Only the data from the upper-left cell will remain in the merged cell.
Are you sure you want to continue?",
+ "textOk": "Ok",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Error": {
"convertationTimeoutText": "Conversion timeout exceeded.",
diff --git a/apps/spreadsheeteditor/mobile/locale/vi.json b/apps/spreadsheeteditor/mobile/locale/vi.json
index d0f75fb08..c85a089b5 100644
--- a/apps/spreadsheeteditor/mobile/locale/vi.json
+++ b/apps/spreadsheeteditor/mobile/locale/vi.json
@@ -63,7 +63,9 @@
"textCopyCutPasteActions": "Copy, Cut and Paste Actions",
"textDoNotShowAgain": "Don't show again",
"warnMergeLostData": "The operation can destroy data in the selected cells. Continue?",
- "errorInvalidLink": "The link reference does not exist. Please correct the link or delete it."
+ "errorInvalidLink": "The link reference does not exist. Please correct the link or delete it.",
+ "textOk": "Ok",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Controller": {
"Main": {
diff --git a/apps/spreadsheeteditor/mobile/locale/zh-TW.json b/apps/spreadsheeteditor/mobile/locale/zh-TW.json
index e0ec0d7bb..3130095b4 100644
--- a/apps/spreadsheeteditor/mobile/locale/zh-TW.json
+++ b/apps/spreadsheeteditor/mobile/locale/zh-TW.json
@@ -63,7 +63,9 @@
"notcriticalErrorTitle": "警告",
"textCopyCutPasteActions": "複製, 剪下, 與貼上之動作",
"textDoNotShowAgain": "不再顯示",
- "warnMergeLostData": "只有左上角單元格中的數據會保留。
繼續嗎？"
+ "warnMergeLostData": "只有左上角單元格中的數據會保留。
繼續嗎？",
+ "textOk": "Ok",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Controller": {
"Main": {
diff --git a/apps/spreadsheeteditor/mobile/locale/zh.json b/apps/spreadsheeteditor/mobile/locale/zh.json
index bbee39589..04ca1c55a 100644
--- a/apps/spreadsheeteditor/mobile/locale/zh.json
+++ b/apps/spreadsheeteditor/mobile/locale/zh.json
@@ -63,7 +63,9 @@
"notcriticalErrorTitle": "警告",
"textCopyCutPasteActions": "拷贝，剪切和粘贴操作",
"textDoNotShowAgain": "不要再显示",
- "warnMergeLostData": "只有来自左上方单元格的数据将保留在合并的单元格中。
您确定要继续吗？"
+ "warnMergeLostData": "只有来自左上方单元格的数据将保留在合并的单元格中。
您确定要继续吗？",
+ "textOk": "Ok",
+ "txtWarnUrl": "Clicking this link can be harmful to your device and data.
Are you sure you want to continue?"
},
"Controller": {
"Main": {
diff --git a/apps/spreadsheeteditor/mobile/src/controller/ContextMenu.jsx b/apps/spreadsheeteditor/mobile/src/controller/ContextMenu.jsx
index 8deb76aa2..e7b8c6cc5 100644
--- a/apps/spreadsheeteditor/mobile/src/controller/ContextMenu.jsx
+++ b/apps/spreadsheeteditor/mobile/src/controller/ContextMenu.jsx
@@ -137,7 +137,7 @@ class ContextMenu extends ContextMenuController {
}
} else {
const url = linkinfo.asc_getHyperlinkUrl().replace(/\s/g, "%20");
- api.asc_getUrlType(url) > 0 && this.openLink(url);
+ this.openLink(url);
}
break;
}
@@ -193,10 +193,32 @@ class ContextMenu extends ContextMenuController {
}
openLink(url) {
- const newDocumentPage = window.open(url, '_blank');
-
- if (newDocumentPage) {
- newDocumentPage.focus();
+ if (url) {
+ const type = Common.EditorApi.get().asc_getUrlType(url);
+ if (type===AscCommon.c_oAscUrlType.Http || type===AscCommon.c_oAscUrlType.Email) {
+ const newDocumentPage = window.open(url, '_blank');
+ if (newDocumentPage) {
+ newDocumentPage.focus();
+ }
+ } else {
+ const { t } = this.props;
+ const _t = t("ContextMenu", { returnObjects: true });
+ f7.dialog.create({
+ title: _t.notcriticalErrorTitle,
+ text : _t.txtWarnUrl,
+ buttons: [{
+ text: _t.textOk,
+ bold: true,
+ onClick: () => {
+ const newDocumentPage = window.open(url, '_blank');
+ if (newDocumentPage) {
+ newDocumentPage.focus();
+ }
+ }
+ },
+ { text: _t.menuCancel }]
+ }).open();
+ }
}
}
diff --git a/apps/spreadsheeteditor/mobile/src/controller/add/AddLink.jsx b/apps/spreadsheeteditor/mobile/src/controller/add/AddLink.jsx
index ebb52d369..592b35be2 100644
--- a/apps/spreadsheeteditor/mobile/src/controller/add/AddLink.jsx
+++ b/apps/spreadsheeteditor/mobile/src/controller/add/AddLink.jsx
@@ -55,9 +55,8 @@ class AddLinkController extends Component {
if (args.type == 'ext') {
let url = args.url;
const urltype = api.asc_getUrlType(url.trim());
- const isEmail = (urltype == 2);
- if (urltype < 1) {
+ if (urltype===AscCommon.c_oAscUrlType.Invalid) {
f7.dialog.create({
title: _t.notcriticalErrorTitle,
text: _t.txtNotUrl,
@@ -72,8 +71,8 @@ class AddLinkController extends Component {
url = url.replace(/^\s+|\s+$/g, '');
- if (!/(((^https?)|(^ftp)):\/\/)|(^mailto:)/i.test(url))
- url = (isEmail ? 'mailto:' : 'http://' ) + url;
+ if (urltype!==AscCommon.c_oAscUrlType.Unsafe && !/(((^https?)|(^ftp)):\/\/)|(^mailto:)/i.test(url))
+ url = (urltype===AscCommon.c_oAscUrlType.Email ? 'mailto:' : 'http://' ) + url;
url = url.replace(new RegExp("%20", 'g'), " ");
diff --git a/apps/spreadsheeteditor/mobile/src/controller/edit/EditLink.jsx b/apps/spreadsheeteditor/mobile/src/controller/edit/EditLink.jsx
index 523739b7c..34a9a2f03 100644
--- a/apps/spreadsheeteditor/mobile/src/controller/edit/EditLink.jsx
+++ b/apps/spreadsheeteditor/mobile/src/controller/edit/EditLink.jsx
@@ -78,27 +78,25 @@ class EditLinkController extends Component {
defaultDisplay = sheet + '!' + range;
} else {
let url = args.url.replace(/^\s+|\s+$/g,'');
+ let urltype = api.asc_getUrlType(url.trim());
- if (! /(((^https?)|(^ftp)):\/\/)|(^mailto:)/i.test(url)) {
- let urlType = api.asc_getUrlType(url.trim());
+ if (urltype===AscCommon.c_oAscUrlType.Invalid) {
+ f7.dialog.create({
+ title: t('View.Edit.notcriticalErrorTitle'),
+ text: t('View.Edit.textNotUrl'),
+ buttons: [
+ {
+ text: t('View.Edit.textOk')
+ }
+ ]
+ }).open();
- if (urlType < 1) {
- f7.dialog.create({
- title: t('View.Edit.notcriticalErrorTitle'),
- text: t('View.Edit.textNotUrl'),
- buttons: [
- {
- text: t('View.Edit.textOk')
- }
- ]
- }).open();
-
- return;
- }
-
- url = ( (urlType == 2) ? 'mailto:' : 'http://' ) + url;
+ return;
}
+ if (urltype!==AscCommon.c_oAscUrlType.Unsafe && ! /(((^https?)|(^ftp)):\/\/)|(^mailto:)/i.test(url))
+ url = ( (urltype===AscCommon.c_oAscUrlType.Email) ? 'mailto:' : 'http://' ) + url;
+
url = url.replace(new RegExp("%20",'g')," ");
linkProps.asc_setHyperlinkUrl(url);