Editors and popup fixes

comindware · Aug 2, 2022 · 8f52de8 · 8f52de8
1 parent 2f34ac5
commit 8f52de8
Show file tree

Hide file tree

Showing 8 changed files with 324 additions and 306 deletions.
diff --git a/src/form/editors/DatalistEditorView.ts b/src/form/editors/DatalistEditorView.ts
@@ -490,8 +490,8 @@ export default (formRepository.editors.Datalist = BaseEditorView.extend({
  template: Handlebars.compile(template),
 
  setValue(value, { triggerChange = false, isLoadIfNeeded = true } = {}): void {
- if(this.options.isAutocompleteMode) {
- this.dropdownView.setInputValue(value);
+ if (this.options.isAutocompleteMode) {
+ this.dropdownView.setValue(value);
  }
  this.__value(value, { triggerChange, isLoadIfNeeded });
  },

diff --git a/src/form/formRepository.ts b/src/form/formRepository.ts
@@ -12,6 +12,7 @@ import Https from './validators/httpsValidator';
 import Telegram from './validators/tgValidator';
 import MailTo from './validators/mailtoValidator';
 import Ftp from './validators/ftpValidator';
+import Ftps from './validators/ftpsValidator';
 import Git from './validators/gitValidator';
 import Ssh from './validators/sshValidator';
 
@@ -33,7 +34,8 @@ export default {
  mailto: MailTo,
  git: Git,
  ssh: Ssh,
- ftp: Ftp
+ ftp: Ftp,
+ ftps: Ftps
  },
  getValidator(validator: string | Function) {
  const validators = this.validators;

diff --git a/src/form/validators/ftpsValidator.ts b/src/form/validators/ftpsValidator.ts
@@ -9,7 +9,7 @@ export default () =>
 
  const err = {
  type: 'uri',
- message: LocalizationService.get('CORE.FORM.EDITORS.URIEDITOR.MSGVALIDATORFTP')
+ message: LocalizationService.get('CORE.FORM.EDITORS.URIEDITOR.MSGVALIDATORFTPS')
  };
  if (!/^ftps:\/\//.test(value)) {
  return err;

diff --git a/src/form/validators/tgValidator.ts b/src/form/validators/tgValidator.ts
@@ -11,7 +11,7 @@ export default () =>
  type: 'uri',
  message: LocalizationService.get('CORE.FORM.EDITORS.URIEDITOR.MSGVALIDATORTELEGRAM')
  };
- if (!/^tg:\/\//.test(value)) {
+ if (!/^https:\/\/t.me\//.test(value)) {
  return err;
  }
  };
diff --git a/src/layout/tabLayout/TabLayoutView.ts b/src/layout/tabLayout/TabLayoutView.ts
@@ -329,17 +329,16 @@ export default Marionette.View.extend({
  const region = this.addRegion(`${tabModel.id}TabRegion`, {
  el: regionEl
  });
- isLoadingNeeded && this.setLoading(true);
  const __view = this.tabsViewById[tabModel.id];
  const view = typeof __view === 'function' ? __view(tabModel) : __view;
  if (helpers.isPromise(view)) {
+ isLoadingNeeded && this.setLoading(true);
  view.then((_view: Backbone.View) => {
  this.showTab({ view: _view, tabModel, region, regionEl });
  isLoadingNeeded && this.setLoading(false);
  });
  } else {
  this.showTab({ view, tabModel, region, regionEl });
- isLoadingNeeded && this.setLoading(false);
  }
  },