Эх сурвалжийг харах

finish using console button

andre 4 жил өмнө
parent
commit
0e38bd875d

+ 0 - 22
templates/admin/assets/js/defaultComponents/__vue_app_modal_object.js

@@ -532,28 +532,6 @@ var mgDefauleVueModalObject = {
                         window.location = self.targetUrl;
                     }
                 },
-                popup : function (event, params, targetSize) {
-                    var self = this;
-                    var tempUrl = self.targetUrl;
-                    if(params.rawUrl !== undefined){
-                        self.targetUrl = params.rawUrl;
-                    }
-                    if(params.actionElementId !== undefined) {
-                        self.getActionId(event);
-                    }
-                    $.each(params, function(key, value){
-                        if(key === 'rawUrl' || key === 'actionElementId'){
-                            return false;
-                        } else {
-                            self.updateUrlParam(key.replace('__', '-'), value, event);
-                        }
-                    });
-                    if (targetSize) {
-                        window.open(self.targetUrl, '', targetSize);
-                    } else {
-                        window.open(self.targetUrl, '_blank');
-                    }
-                },
                 submitFormByEvent : function(event){
                     var self = this;
                     self.submitForm($(event.target).parents("form").first().attr('id'), event);

+ 3 - 0
templates/admin/assets/js/defaultComponents/dataTable.js

@@ -287,6 +287,9 @@ mgJsComponentHandler.addDefaultComponent('mg-datatable', {
         redirect :  function (event, params, targetBlank) {
             mgPageControler.vueLoader.redirect(event, params, targetBlank);
         },
+        popup :  function (event, params, targetSize) {
+            mgPageControler.vueLoader.popup(event, params, targetSize);
+        },
         getFilters: function () {
             return this.$store.getters.getComponentData(this.component_id, 'filters');
         }

+ 0 - 22
templates/client/default/assets/js/defaultComponents/__vue_app_modal_object.js

@@ -532,28 +532,6 @@ var mgDefauleVueModalObject = {
                         window.location = self.targetUrl;
                     }
                 },
-                popup : function (event, params, targetSize) {
-                    var self = this;
-                    var tempUrl = self.targetUrl;
-                    if(params.rawUrl !== undefined){
-                        self.targetUrl = params.rawUrl;
-                    }
-                    if(params.actionElementId !== undefined) {
-                        self.getActionId(event);
-                    }
-                    $.each(params, function(key, value){
-                        if(key === 'rawUrl' || key === 'actionElementId'){
-                            return false;
-                        } else {
-                            self.updateUrlParam(key.replace('__', '-'), value, event);
-                        }
-                    });
-                    if (targetSize) {
-                        window.open(self.targetUrl, '', targetSize);
-                    } else {
-                        window.open(self.targetUrl, '_blank');
-                    }
-                },
                 submitFormByEvent : function(event){
                     var self = this;
                     self.submitForm($(event.target).parents("form").first().attr('id'), event);