diff .svn/pristine/45/45968d1e38a350b8030b3a3d7d3ad6a0c16f4f7a.svn-base @ 1494:e248c7af89ec redmine-2.4

Update to Redmine SVN revision 12979 on 2.4-stable branch

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.svn/pristine/45/45968d1e38a350b8030b3a3d7d3ad6a0c16f4f7a.svn-base	Mon Mar 17 08:54:02 2014 +0000
@@ -0,0 +1,45 @@
+# Redmine - project management software
+# Copyright (C) 2006-2014  Jean-Philippe Lang
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+require 'redmine/views/builders/structure'
+
+module Redmine
+  module Views
+    module Builders
+      class Json < Structure
+        attr_accessor :jsonp
+
+        def initialize(request, response)
+          super
+          callback = request.params[:callback] || request.params[:jsonp]
+          if callback && Setting.jsonp_enabled?
+            self.jsonp = callback.to_s.gsub(/[^a-zA-Z0-9_]/, '')
+          end
+        end
+
+        def output
+          json = @struct.first.to_json
+          if jsonp.present?
+            json = "#{jsonp}(#{json})"
+            response.content_type = 'application/javascript'
+          end
+          json
+        end
+      end
+    end
+  end
+end