remove spinner

joomla · May 30, 2015 · e68f7b0 · e68f7b0
1 parent 5e5a0b3
commit e68f7b0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 14 deletions.
diff --git a/administrator/components/com_joomlaupdate/views/default/tmpl/default.php b/administrator/components/com_joomlaupdate/views/default/tmpl/default.php
@@ -46,7 +46,6 @@
 JHtml::_('jquery.framework');
 JHtml::_('formbehavior.chosen', 'select');
 JHtml::script('com_joomlaupdate/default.js', false, true, false);
-JHtml::stylesheet('media/mediamanager.css', false, true, false);
 ?>
 
 <form action="index.php" method="post" id="adminForm">

diff --git a/administrator/components/com_joomlaupdate/views/update/tmpl/default.php b/administrator/components/com_joomlaupdate/views/update/tmpl/default.php
@@ -9,9 +9,6 @@
 
 defined('_JEXEC') or die;
 
-// Load the stylesheet
-JHtml::stylesheet('media/mediamanager.css', false, true, false);
-
 // Include jQuery.
 JHtml::_('jquery.framework');
 
@@ -31,12 +28,15 @@
 	var joomlaupdate_totalsize = '$filesize';
 	var joomlaupdate_ajax_url = '$ajaxUrl';
 	var joomlaupdate_return_url = '$returnUrl';
+
+	jQuery(document).ready(function(){
+		window.pingExtract();
+		});
 	"
 );
 ?>
 
 <p class="nowarning"><?php echo JText::_('COM_JOOMLAUPDATE_VIEW_UPDATE_INPROGRESS') ?></p>
-<div class="joomlaupdate_spinner" ></div>
 
 <div id="update-progress">
 	<div id="extprogress">

diff --git a/media/com_joomlaupdate/js/update.js b/media/com_joomlaupdate/js/update.js
@@ -269,15 +269,12 @@ stepExtract = function(data)
 		{
 			joomlaupdate_stat_percent = 100;
 		}
-	}
-
-	if(data.done) joomlaupdate_stat_percent = 100;
 
-	// Update progress bar
-	if (joomlaupdate_stat_percent < 100)
-	{
 		jQuery('#progress-bar').css('width', joomlaupdate_stat_percent + '%').attr('aria-valuenow', joomlaupdate_stat_percent);
-	} else {
+	}
+
+	if(data.done) {
+		joomlaupdate_stat_percent = 100;
 		jQuery('#progress-bar').removeClass('bar-success');
 	}
 
@@ -311,9 +308,9 @@ stepExtract = function(data)
 finalizeUpdate = function ()
 {
 	// Do AJAX post
-	var post = { task : 'finalizeRestore', factory: data.factory };
+	var post = { task : 'finalizeRestore', factory: window.factory };
 	doEncryptedAjax(post, function(data){
-		window.location = 'index.php?option=com_window&view=update&task=finalise';
+		window.location = 'index.php?option=com_joomlaupdate&view=update&task=finalise';
 	});
 };