Merge pull request #287 from PressForward/3.1.x

3.1.2 - A release for testers.

assets/js/views.js

@@ -80,6 +80,7 @@ function commentPopModal(){
 		var itemID = element.attr('pf-item-id');
 		var postID = element.attr('pf-post-id');
 		var item_post_ID = element.attr('pf-item-post-id');
+        jQuery('#ef-comments_wrapper').remove();
 		//alert(modalIDString);
 		jQuery.post(ajaxurl, {
 				action: 'ajax_get_comments',
@@ -90,6 +91,10 @@ function commentPopModal(){
 				jQuery('#comment_modal_'+item_post_ID+' .modal-body').html(comment_response);
 			});				
 	});
+
+    jQuery('.pf_container').on('hide', '.modal.comment-modal', function(evt){
+        jQuery('#ef-comments_wrapper').remove();  
+    });
 }	
 
 function reshowModal(){		
@@ -152,6 +157,9 @@ function reviewModal(){
 function hideModal(){	
 	jQuery('.pf_container').on('hide', ".modal.pfmodal", function(evt){
 		jQuery(".pfmodal .modal-comments").html('');
+        if (typeof editorialCommentReply == 'function') { 
+                  editorialCommentReply.close(); 
+        }           
 		jQuery('#wpadminbar').show();
 		jQuery('#adminmenuback').show();
 		jQuery('#adminmenuwrap').show();		

pressforward.php

@@ -3,7 +3,7 @@
 Plugin Name: PressForward
 Plugin URI: http://pressforward.org/
 Description: This plugin is an aggregation parser for CHNM's Press Forward project.
-Version: 3.1.1
+Version: 3.1.2
 Author: Aram Zucker-Scharff, Boone B Gorges, Jeremy Boggs
 Author URI: http://aramzs.me, http://boone.gorg.es/, http://clioweb.org
 License: GPL2
@@ -34,7 +34,7 @@
 define( 'PF_ROOT', dirname(__FILE__) );
 define( 'PF_FILE_PATH', PF_ROOT . '/' . basename(__FILE__) );
 define( 'PF_URL', plugins_url('/', __FILE__) );
-define( 'PF_VERSION', '3.1.1' );
+define( 'PF_VERSION', '3.1.2' );
 
 class PressForward {
 	var $modules = array();

readme.md

@@ -1,7 +1,7 @@
 ## Plugin Name: PressForward
 - Plugin URI: http://pressforward.org/
 - Description: PressForward is a WordPress plugin built to process feeds as a feed reader, allow groups to share and discuss the items that come in and then blog about them as an integrated editorial process. Currently in Beta.
-- Version: 3.1.0
+- Version: 3.1.2
 - Author: Aram Zucker-Scharff, Boone B Gorges, Jeremy Boggs
 - Author URI: http://pressforward.org/
 - License: GPL2

readme.txt

@@ -3,7 +3,7 @@ Contributors: PressForward, AramZS, boonebgorges, joanftroyano, clioweb
 Version: 3.1.0
 Donate link:
 Tags: aggregation, atom, content curation, curation, curation tool, editorial, feed, RSS, workflow
-Requires at least: 3.0.1
+Requires at least: 3.1.2
 Tested up to: 3.8
 Stable tag: 3.1.0
 License: GPL2