From d7afbb815c7d185df9143f886a7494cb73a69ac1 Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Tue, 6 Sep 2016 16:31:13 +0500
Subject: - Rename ServerDialogController to MapPickerDialogController

- removed getView()
---
 web/app/view/MapPickerDialogController.js | 41 +++++++++++++++++++++++++++++++
 web/app/view/ServerDialog.js              |  4 +--
 web/app/view/ServerDialogController.js    | 41 -------------------------------
 web/app/view/UserDialogController.js      |  2 +-
 4 files changed, 44 insertions(+), 44 deletions(-)
 create mode 100644 web/app/view/MapPickerDialogController.js
 delete mode 100644 web/app/view/ServerDialogController.js

(limited to 'web')

diff --git a/web/app/view/MapPickerDialogController.js b/web/app/view/MapPickerDialogController.js
new file mode 100644
index 000000000..4f202d195
--- /dev/null
+++ b/web/app/view/MapPickerDialogController.js
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2016 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2016 Andrey Kunitsyn (abyss@fox5.ru)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+Ext.define('Traccar.view.MapPickerDialogController', {
+    extend: 'Traccar.view.BaseEditDialogController',
+    alias: 'controller.mapPickerDialog',
+
+    config: {
+        listen: {
+            controller: {
+                '*': {
+                    mapstate: 'setMapState'
+                }
+            }
+        }
+    },
+
+    getMapState: function (button) {
+        this.fireEvent('mapstaterequest');
+    },
+
+    setMapState: function (lat, lon, zoom) {
+        this.lookupReference('latitude').setValue(lat);
+        this.lookupReference('longitude').setValue(lon);
+        this.lookupReference('zoom').setValue(zoom);
+    }
+});
diff --git a/web/app/view/ServerDialog.js b/web/app/view/ServerDialog.js
index 40afa4ec3..46c76ffa8 100644
--- a/web/app/view/ServerDialog.js
+++ b/web/app/view/ServerDialog.js
@@ -18,10 +18,10 @@ Ext.define('Traccar.view.ServerDialog', {
     extend: 'Traccar.view.BaseEditDialog',
 
     requires: [
-        'Traccar.view.ServerDialogController'
+        'Traccar.view.MapPickerDialogController'
     ],
 
-    controller: 'serverEditDialog',
+    controller: 'mapPickerDialog',
     title: Strings.serverTitle,
 
     items: {
diff --git a/web/app/view/ServerDialogController.js b/web/app/view/ServerDialogController.js
deleted file mode 100644
index 55f49f676..000000000
--- a/web/app/view/ServerDialogController.js
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2016 Anton Tananaev (anton.tananaev@gmail.com)
- * Copyright 2016 Andrey Kunitsyn (abyss@fox5.ru)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-Ext.define('Traccar.view.ServerDialogController', {
-    extend: 'Traccar.view.BaseEditDialogController',
-    alias: 'controller.serverEditDialog',
-
-    config: {
-        listen: {
-            controller: {
-                '*': {
-                    mapstate: 'setMapState'
-                }
-            }
-        }
-    },
-
-    getMapState: function (button) {
-        this.fireEvent('mapstaterequest');
-    },
-
-    setMapState: function (lat, lon, zoom) {
-        this.getView().lookupReference('latitude').setValue(lat);
-        this.getView().lookupReference('longitude').setValue(lon);
-        this.getView().lookupReference('zoom').setValue(zoom);
-    }
-});
diff --git a/web/app/view/UserDialogController.js b/web/app/view/UserDialogController.js
index 5e541c870..52d649b9c 100644
--- a/web/app/view/UserDialogController.js
+++ b/web/app/view/UserDialogController.js
@@ -15,7 +15,7 @@
  */
 
 Ext.define('Traccar.view.UserDialogController', {
-    extend: 'Traccar.view.ServerDialogController',
+    extend: 'Traccar.view.MapPickerDialogController',
     alias: 'controller.userDialog',
 
     init: function () {
-- 
cgit v1.2.3