diff options
Diffstat (limited to 'web')
-rw-r--r-- | web/app/view/BaseWindow.js | 1 | ||||
-rw-r--r-- | web/app/view/SettingsMenuController.js | 8 | ||||
-rw-r--r-- | web/app/view/dialog/Base.js | 1 | ||||
-rw-r--r-- | web/app/view/dialog/BaseEditController.js | 1 | ||||
-rw-r--r-- | web/app/view/dialog/Login.js | 1 | ||||
-rw-r--r-- | web/app/view/dialog/Register.js | 2 | ||||
-rw-r--r-- | web/app/view/edit/UsersController.js | 1 |
7 files changed, 1 insertions, 14 deletions
diff --git a/web/app/view/BaseWindow.js b/web/app/view/BaseWindow.js index cb4879f..bf698e0 100644 --- a/web/app/view/BaseWindow.js +++ b/web/app/view/BaseWindow.js @@ -21,7 +21,6 @@ Ext.define('Traccar.view.BaseWindow', { width: Traccar.Style.windowWidth, height: Traccar.Style.windowHeight, layout: 'fit', - modal: true, initComponent: function () { if (window.innerWidth < Traccar.Style.windowWidth || window.innerHeight < Traccar.Style.windowHeight) { diff --git a/web/app/view/SettingsMenuController.js b/web/app/view/SettingsMenuController.js index 2bd4b98..a1883a6 100644 --- a/web/app/view/SettingsMenuController.js +++ b/web/app/view/SettingsMenuController.js @@ -74,7 +74,6 @@ Ext.define('Traccar.view.SettingsMenuController', { onGroupsClick: function () { Ext.create('Traccar.view.BaseWindow', { title: Strings.settingsGroups, - modal: false, items: { xtype: 'groupsView' } @@ -84,7 +83,6 @@ Ext.define('Traccar.view.SettingsMenuController', { onGeofencesClick: function () { Ext.create('Traccar.view.BaseWindow', { title: Strings.sharedGeofences, - modal: false, items: { xtype: 'geofencesView' } @@ -100,7 +98,6 @@ Ext.define('Traccar.view.SettingsMenuController', { onUsersClick: function () { Ext.create('Traccar.view.BaseWindow', { title: Strings.settingsUsers, - modal: false, items: { xtype: 'usersView' } @@ -111,7 +108,6 @@ Ext.define('Traccar.view.SettingsMenuController', { var user = Traccar.app.getUser(); Ext.create('Traccar.view.BaseWindow', { title: Strings.sharedNotifications, - modal: false, items: { xtype: 'notificationsView', user: user @@ -122,7 +118,6 @@ Ext.define('Traccar.view.SettingsMenuController', { onAttributeAliasesClick: function () { Ext.create('Traccar.view.BaseWindow', { title: Strings.sharedAttributeAliases, - modal: false, items: { xtype: 'attributeAliasesView' } @@ -132,7 +127,6 @@ Ext.define('Traccar.view.SettingsMenuController', { onComputedAttributesClick: function () { Ext.create('Traccar.view.BaseWindow', { title: Strings.sharedComputedAttributes, - modal: false, items: { xtype: 'computedAttributesView' } @@ -142,7 +136,6 @@ Ext.define('Traccar.view.SettingsMenuController', { onStatisticsClick: function () { Ext.create('Traccar.view.BaseWindow', { title: Strings.statisticsTitle, - modal: false, items: { xtype: 'statisticsView' } @@ -157,7 +150,6 @@ Ext.define('Traccar.view.SettingsMenuController', { onCalendarsClick: function () { Ext.create('Traccar.view.BaseWindow', { title: Strings.sharedCalendars, - modal: false, items: { xtype: 'calendarsView' } diff --git a/web/app/view/dialog/Base.js b/web/app/view/dialog/Base.js index 5aad254..20945c0 100644 --- a/web/app/view/dialog/Base.js +++ b/web/app/view/dialog/Base.js @@ -20,7 +20,6 @@ Ext.define('Traccar.view.dialog.Base', { bodyPadding: Traccar.Style.normalPadding, resizable: false, - modal: true, autoScroll: true, constrain: true, diff --git a/web/app/view/dialog/BaseEditController.js b/web/app/view/dialog/BaseEditController.js index 7183214..f58b6cb 100644 --- a/web/app/view/dialog/BaseEditController.js +++ b/web/app/view/dialog/BaseEditController.js @@ -52,7 +52,6 @@ Ext.define('Traccar.view.dialog.BaseEditController', { record = dialog.getRecord(); Ext.create('Traccar.view.BaseWindow', { title: Strings.sharedAttributes, - modal: false, items: { xtype: 'attributesView', record: record diff --git a/web/app/view/dialog/Login.js b/web/app/view/dialog/Login.js index 5a0695e..e015519 100644 --- a/web/app/view/dialog/Login.js +++ b/web/app/view/dialog/Login.js @@ -27,7 +27,6 @@ Ext.define('Traccar.view.dialog.Login', { header: false, closable: false, - modal: false, items: { xtype: 'form', diff --git a/web/app/view/dialog/Register.js b/web/app/view/dialog/Register.js index 03b3009..f9608ce 100644 --- a/web/app/view/dialog/Register.js +++ b/web/app/view/dialog/Register.js @@ -41,7 +41,7 @@ Ext.define('Traccar.view.dialog.Register', { name: 'email', fieldLabel: Strings.userEmail, validator: function (val) { - if (/(.+)@(.+){2,}\.(.+){2,}/.test(val)) { + if (/(.+)@(.+)\.(.{2,})/.test(val)) { return true; } else { return Ext.form.field.VTypes.emailText; diff --git a/web/app/view/edit/UsersController.js b/web/app/view/edit/UsersController.js index c064403..a6f150b 100644 --- a/web/app/view/edit/UsersController.js +++ b/web/app/view/edit/UsersController.js @@ -118,7 +118,6 @@ Ext.define('Traccar.view.edit.UsersController', { var user = this.getView().getSelectionModel().getSelection()[0]; Ext.create('Traccar.view.BaseWindow', { title: Strings.sharedNotifications, - modal: false, items: { xtype: 'notificationsView', user: user |