From 0f2989e19bd522a2fa6220b82db2c005cb74ffd7 Mon Sep 17 00:00:00 2001 From: Patrick O'Carroll Date: Thu, 26 Oct 2017 13:27:17 +0200 Subject: [PATCH] converted inspect_ctrl.js to ts (#9673) --- .../{inspect_ctrl.js => inspect_ctrl.ts} | 48 +++++++++---------- 1 file changed, 23 insertions(+), 25 deletions(-) rename public/app/core/controllers/{inspect_ctrl.js => inspect_ctrl.ts} (65%) diff --git a/public/app/core/controllers/inspect_ctrl.js b/public/app/core/controllers/inspect_ctrl.ts similarity index 65% rename from public/app/core/controllers/inspect_ctrl.js rename to public/app/core/controllers/inspect_ctrl.ts index 39d550658f1..70516986099 100644 --- a/public/app/core/controllers/inspect_ctrl.js +++ b/public/app/core/controllers/inspect_ctrl.ts @@ -1,27 +1,14 @@ -define([ - 'angular', - 'lodash', - 'jquery', - '../core_module', -], -function (angular, _, $, coreModule) { - 'use strict'; +import angular from 'angular'; +import _ from 'lodash'; +import $ from 'jquery'; +import coreModule from '../core_module'; - coreModule.default.controller('InspectCtrl', function($scope, $sanitize) { +export class InspectCtrl { + + /** @ngInject */ + constructor($scope, $sanitize) { var model = $scope.inspector; - function getParametersFromQueryString(queryString) { - var result = []; - var parameters = queryString.split("&"); - for (var i = 0; i < parameters.length; i++) { - var keyValue = parameters[i].split("="); - if (keyValue[1].length > 0) { - result.push({ key: keyValue[0], value: window.unescape(keyValue[1]) }); - } - } - return result; - } - $scope.init = function () { $scope.editor = { index: 0 }; @@ -57,7 +44,7 @@ function (angular, _, $, coreModule) { $scope.editor.index = 2; if (_.isString(model.error.config.data)) { - $scope.request_parameters = getParametersFromQueryString(model.error.config.data); + $scope.request_parameters = this.getParametersFromQueryString(model.error.config.data); } else { $scope.request_parameters = _.map(model.error.config.data, function(value, key) { return {key: key, value: angular.toJson(value, true)}; @@ -65,7 +52,18 @@ function (angular, _, $, coreModule) { } } }; + } + getParametersFromQueryString(queryString) { + var result = []; + var parameters = queryString.split("&"); + for (var i = 0; i < parameters.length; i++) { + var keyValue = parameters[i].split("="); + if (keyValue[1].length > 0) { + result.push({ key: keyValue[0], value: (window).unescape(keyValue[1]) }); + } + } + return result; + } +} - }); - -}); +coreModule.controller('InspectCtrl', InspectCtrl);