Merge branch 'development'

Author: GEROMAX

README.md

@@ -12,13 +12,14 @@ This plugin provide on pop-up show feature of diff.
 
 ## Compatibility
 
-Redmine 3.2 or 3.3 or 3.4 stable
+Redmine 3.2 or 3.3 or 3.4 or 4.0 stable
 
 Tested on:
 
 * 3.2.2
 * 3.3.0
-* 3.4.3
+* 3.4.8
+* 4.0.1
 
 ## Installation
 

assets/javascripts/wiki_popup.js

@@ -1,6 +1,7 @@
 function replaceWikiSubmitButton()
 {
-  $("button.wiki-popup, #project_id, #id").replaceAll($("#content > form > input.small")).filter("button.wiki-popup").show().on("click", function(){  
+  $("#project_id, #id").insertBefore("#content > form > table");
+  $("button.wiki-popup").replaceAll($("#content > form input[type='submit']")).filter("button.wiki-popup").show().on("click", function(){
     //on top dialog
     var dlgName = "#diffpopup" + $("input[name='version_from']:checked").val() + "_" + $("input[name='version']:checked").val();
     if ($(dlgName).size() == 1)
@@ -10,7 +11,7 @@ function replaceWikiSubmitButton()
     }
 
     //show dialog
-    var diffUrl = $(this).attr("url") + $(this).parent("form").serialize();
+    var diffUrl = $(this).attr("url") + $(this).parents("form").serialize();
     $.get(diffUrl, function (data) {
       var params = q_to_hash(decodeURIComponent(this.url).split("?")[1].split("&"));
       var popupId = "diffpopup" + params["version_from"] + "_" + params["version"];
@@ -47,4 +48,4 @@ function q_to_hash(param){
     hs[kv[0]]=kv[1];
   }
   return hs;
-}
+}

init.rb

@@ -3,7 +3,8 @@
 require_dependency 'redmine_diff_popup/patches/user_preference_patch'
 
 
-ActionDispatch::Callbacks.to_prepare do
+reloader = defined?(ActiveSupport::Reloader) ? ActiveSupport::Reloader : ActionDispatch::Reloader
+reloader.to_prepare do
   unless UserPreference.included_modules.include?(RedmineDiffPopup::Patches::UserPreferencePatch)
     UserPreference.send :prepend, RedmineDiffPopup::Patches::UserPreferencePatch
   end
@@ -18,7 +19,7 @@
   name 'Redmine Diff Popup plugin'
   author 'Ryuta Tobita'
   description 'This plugin provide on pop-up show feature of diff.'
-  version '2.1.0'
+  version '2.2.0'
   url 'https://github.com/GEROMAX/redmine_diff_popup'
   author_url 'https://github.com/GEROMAX'
   permission :wiki_popup, {:wiki_popup => [:wiki_diff]}, :public => true