Merge "Fix Deprecated: jQuery.parseJSON() warning by updating to JSON.parse()"

4 files changed, 4 insertions, 4 deletions

diff --git a/horizon/static/horizon/js/horizon.messages.js b/horizon/static/horizon/js/horizon.messages.js
index 049a94273..2e8484585 100644
--- a/horizon/static/horizon/js/horizon.messages.js
+++ b/horizon/static/horizon/js/horizon.messages.js
@@ -93,7 +93,7 @@ horizon.autoDismissAlert = function ($alert) {
 horizon.addInitFunction(function () {
   // Bind AJAX message handling.
   $(document).ajaxComplete(function(event, request){
-    var message_array = $.parseJSON(horizon.ajax.get_messages(request));
+    var message_array = JSON.parse(horizon.ajax.get_messages(request));
     $(message_array).each(function (index, item) {
       horizon.alert(item[0], item[1], item[2]);
     });
diff --git a/horizon/static/horizon/js/horizon.modals.js b/horizon/static/horizon/js/horizon.modals.js
index b31a9bbf9..090253e02 100644
--- a/horizon/static/horizon/js/horizon.modals.js
+++ b/horizon/static/horizon/js/horizon.modals.js
@@ -346,7 +346,7 @@ horizon.addInitFunction(horizon.modals.init = function() {
       } else if (redirect_header) {
         location.href = redirect_header;
       } else if (add_to_field_header) {
-        json_data = $.parseJSON(data);
+        json_data = JSON.parse(data);
         field_to_update = $("#" + add_to_field_header);
         field_to_update.append("<option value='" + json_data[0] + "'>" + json_data[1] + "</option>");
         field_to_update.change();
diff --git a/openstack_dashboard/static/js/horizon.networktopology.js b/openstack_dashboard/static/js/horizon.networktopology.js
index 02cba863d..bcccb7bc1 100644
--- a/openstack_dashboard/static/js/horizon.networktopology.js
+++ b/openstack_dashboard/static/js/horizon.networktopology.js
@@ -157,7 +157,7 @@ horizon.network_topology = {
       self.translate = null;
     });
     angular.element(window).on('message', function(e) {
-        var message = angular.element.parseJSON(e.originalEvent.data);
+        var message = JSON.parse(e.originalEvent.data);
         if (self.previous_message !== message.message) {
           horizon.alert(message.type, message.message);
           self.previous_message = message.message;
diff --git a/openstack_dashboard/static/js/horizon.networktopologycommon.js b/openstack_dashboard/static/js/horizon.networktopologycommon.js
index a2722e8fe..417b028dc 100644
--- a/openstack_dashboard/static/js/horizon.networktopologycommon.js
+++ b/openstack_dashboard/static/js/horizon.networktopologycommon.js
@@ -88,7 +88,7 @@ horizon.networktopologymessager = {
 
     // listens for message events
     angular.element(window).on('message', function(e) {
-      var message = angular.element.parseJSON(e.originalEvent.data);
+      var message = JSON.parse(e.originalEvent.data);
       if (self.previous_message !== message.message) {
         horizon.toast.add(message.type, message.message);
         self.previous_message = message.message;