From 8397e0c8db7f91266477632f05d39749d2b209ff Mon Sep 17 00:00:00 2001
From: Alexandre Rafalovitch <arafalov@gmail.com>
Date: Wed, 3 Aug 2016 20:12:19 +1000
Subject: [PATCH] Upayavira's patch tested against latest master

---
 solr/webapp/web/js/angular/controllers/files.js | 4 ++--
 solr/webapp/web/js/angular/services.js          | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/solr/webapp/web/js/angular/controllers/files.js b/solr/webapp/web/js/angular/controllers/files.js
index 1cb9e5cd55e8..908aed83547c 100644
--- a/solr/webapp/web/js/angular/controllers/files.js
+++ b/solr/webapp/web/js/angular/controllers/files.js
@@ -16,7 +16,7 @@
 */
 
 var contentTypeMap = { xml : 'text/xml', html : 'text/html', js : 'text/javascript', json : 'application/json', 'css' : 'text/css' };
-var languages = {js: "javascript", xml:"xml", xsl:"xml", vm: "xml", html: "xml", json: "text", css: "css"};
+var languages = {js: "javascript", xml:"xml", xsl:"xml", vm: "xml", html: "xml", json: "json", css: "css"};
 
 solrAdminApp.controller('FilesController',
     function($scope, $rootScope, $routeParams, $location, Files, Constants) {
@@ -82,7 +82,7 @@ solrAdminApp.controller('FilesController',
                 Files.get({core: $routeParams.core, file: $scope.file, contentType: contentType}, function(data) {
                     $scope.content = data.data;
                     $scope.url = $scope.baseurl + data.config.url + "?" + $.param(data.config.params);
-                    if (contentType.indexOf("text/plain") && data.data.indexOf("<?xml") || data.data.indexOf("<!--")) {
+                    if (contentType.indexOf("text/plain") && (data.data.indexOf("<?xml")>=0) || data.data.indexOf("<!--")>=0) {
                         $scope.lang = "xml";
                     } else {
                         $scope.lang = languages[extension] || "text";
diff --git a/solr/webapp/web/js/angular/services.js b/solr/webapp/web/js/angular/services.js
index 014d36ba525d..90591906bdbf 100644
--- a/solr/webapp/web/js/angular/services.js
+++ b/solr/webapp/web/js/angular/services.js
@@ -207,6 +207,8 @@ solrAdminServices.factory('System',
       "list": {},
       "get": {method: "GET", interceptor: {
           response: function(config) {return config;}
+      }, transformResponse: function(data) {
+          return data;
       }}
     });
   }])