From ed056e42f0fe5e30c1ff2ef8f8b3e29b1640d128 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Wed, 9 May 2018 15:22:11 +0300
Subject: [PATCH] Use initModal instead of init

---
 .../bootstrap/modal-manager.js                | 27 +++++++++----------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore.mvc.ui.theme.shared/bootstrap/modal-manager.js b/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore.mvc.ui.theme.shared/bootstrap/modal-manager.js
index 2a3f899f96..245735c7f2 100644
--- a/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore.mvc.ui.theme.shared/bootstrap/modal-manager.js
+++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore.mvc.ui.theme.shared/bootstrap/modal-manager.js
@@ -9,18 +9,18 @@ $.validator.defaults.ignore = ''; //TODO: Would be better if we can apply only f
 (function ($) {
 
     abp.modals = abp.modals || {};
-    
+
     abp.ModalManager = (function () {
 
-        var CallbackList = function() { //TODO: To a seperated file
+        var CallbackList = function () { //TODO: To a seperated file
             var _callbacks = [];
 
             return {
-                add: function(callback) {
+                add: function (callback) {
                     _callbacks.push(callback);
                 },
 
-                triggerAll: function(thisObj, argumentList) {
+                triggerAll: function (thisObj, argumentList) {
                     for (var i = 0; i < _callbacks.length; i++) {
                         _callbacks[i].apply(thisObj, argumentList);
                     }
@@ -71,14 +71,14 @@ $.validator.defaults.ignore = ''; //TODO: Would be better if we can apply only f
                     }
 
                     _$form.on('abp-ajax-success',
-                        function() {
+                        function () {
                             _publicApi.setResult.apply(_publicApi, arguments);
                             _$modal.modal('hide');
                         });
                 } else {
                     _$form = null;
                 }
-                
+
                 _$modal.modal({
                     backdrop: 'static'
                 });
@@ -95,11 +95,10 @@ $.validator.defaults.ignore = ''; //TODO: Would be better if we can apply only f
                 var modalClass = abp.modals[options.modalClass];
                 if (modalClass) {
                     _modalObject = new modalClass();
-                    if (_modalObject.init) {
-                        _modalObject.init(_publicApi, _args);
-                    }
+                    _modalObject.init && _modalObject.init(_publicApi, _args); //TODO: Remove later
+                    _modalObject.initModal && _modalObject.initModal(_publicApi, _args);
                 }
-                
+
                 _$modal.modal('show');
             };
 
@@ -115,7 +114,7 @@ $.validator.defaults.ignore = ''; //TODO: Would be better if we can apply only f
                         };
 
                         if (options.scriptUrl) {
-                            abp.ResourceLoader.loadScript(options.scriptUrl, function() {
+                            abp.ResourceLoader.loadScript(options.scriptUrl, function () {
                                 _initAndShowModal();
                             });
                         } else {
@@ -124,7 +123,7 @@ $.validator.defaults.ignore = ''; //TODO: Would be better if we can apply only f
                     });
             };
 
-            var _close = function() {
+            var _close = function () {
                 if (!_$modal) {
                     return;
                 }
@@ -144,7 +143,7 @@ $.validator.defaults.ignore = ''; //TODO: Would be better if we can apply only f
 
                 open: _open,
 
-                reopen: function() {
+                reopen: function () {
                     _open(_args);
                 },
 
@@ -166,7 +165,7 @@ $.validator.defaults.ignore = ''; //TODO: Would be better if we can apply only f
                     return _args;
                 },
 
-                getOptions: function() {
+                getOptions: function () {
                     return _options;
                 },