Merge pull request sakaiproject#469 from lorenamgUMU/SAK-28161

SAK-28161 JavaScript errors in Forums
warpwire · May 6, 2015 · c1d11bf · c1d11bf
2 parents 31aeef2 + 53a25d1
commit c1d11bf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 17 deletions.
diff --git a/msgcntr/messageforums-app/src/webapp/js/forum.js b/msgcntr/messageforums-app/src/webapp/js/forum.js
@@ -796,9 +796,6 @@ function resizeFrameForDialog()
         var clientH = document.body.clientHeight + 400;
         $( frame ).height( clientH );
     }
-    else {
-        throw( "resizeFrame did not get the frame (using name=" + window.name + ")" );
-    }
 }
 
 // This is the profile display on user's names.
@@ -820,20 +817,6 @@ $(document).ready(function() {
 	});
 });	
 
-function resizeFrameForDialog()
-{
-    if (top.location != self.location) {
-        var frame = parent.document.getElementById(window.name);
-    }
-    if( frame ) {
-        var clientH = document.body.clientHeight + 400;
-        $( frame ).height( clientH );
-    }
-    else {
-        throw( "resizeFrame did not get the frame (using name=" + window.name + ")" );
-    }
-}
-
 $(document).ready(function(){
     $('.blockMeOnClick').click(function(e){
         var $buttonContainer = $(this).parents('.act');

diff --git a/msgcntr/messageforums-app/src/webapp/js/forum_movethread.js b/msgcntr/messageforums-app/src/webapp/js/forum_movethread.js
@@ -191,6 +191,8 @@ Licenses.
 
     var moveThreadEnabled = function (){
                         //function to check total number of CheckBoxes that are checked in a form
+    			//if there is no elements in form, disable the move link
+    	 		if (typeof document.forms['msgForum'].moveCheckbox === 'undefined') { return false; }
                 //initialize total count to zero
                 var totalChecked = 0;
                                 //get total number of CheckBoxes in form