Browse Source

Merge pull request #881 from Arantor/release-2.1

! There really is no point having the cancel button on the Loading.... p...
Arantor 11 years ago
parent
commit
f3ef515e29
2 changed files with 0 additions and 17 deletions
  1. 0 1
      Sources/Load.php
  2. 0 16
      Themes/default/scripts/script.js

+ 0 - 1
Sources/Load.php

@@ -1816,7 +1816,6 @@ function loadTheme($id_theme = 0, $initialize = true)
 		'smf_session_var' => '"' . $context['session_var'] . '"',
 		'smf_member_id' => $context['user']['id'],
 		'ajax_notification_text' => JavaScriptEscape($txt['ajax_in_progress']),
-		'ajax_notification_cancel_text' => JavaScriptEscape($txt['modify_cancel']),
 		'help_popup_heading_text' => JavaScriptEscape($txt['help_popup']),
 	);
 

+ 0 - 16
Themes/default/scripts/script.js

@@ -972,22 +972,6 @@ function create_ajax_indicator_ele()
 	// Set the id so it'll load the style properly.
 	ajax_indicator_ele.id = 'ajax_in_progress';
 
-	// Add the image in and link to turn it off.
-	var cancel_link = document.createElement('a');
-	cancel_link.href = 'javascript:ajax_indicator(false)';
-	var cancel_img = document.createElement('img');
-	cancel_img.src = smf_images_url + '/icons/quick_remove.png';
-
-	if (typeof(ajax_notification_cancel_text) != 'undefined')
-	{
-		cancel_img.alt = ajax_notification_cancel_text;
-		cancel_img.title = ajax_notification_cancel_text;
-	}
-
-	// Add the cancel link and image to the indicator.
-	cancel_link.appendChild(cancel_img);
-	ajax_indicator_ele.appendChild(cancel_link);
-
 	// Set the text.  (Note:  You MUST append here and not overwrite.)
 	ajax_indicator_ele.innerHTML += ajax_notification_text;