Revert "Resolve merge conflicts"

This reverts commit ddaecad.

Author: pdobrescu

build/shortpixel/composer.json

@@ -1 +1 @@
-{"name":"ReThumbAdvanced\/shortpixelmodules","description":"ShortPixel submodules","type":"function","autoload":{"psr-4":{"ReThumbAdvanced\\ShortPixelLogger":"log\/src","ReThumbAdvanced\\Notices":"notices\/src","ReThumbAdvanced\\ShortQ":"shortq\/src"}}}
+{"name":"ReThumbAdvanced\/shortpixelmodules","description":"ShortPixel submodules","type":"function","autoload":{"psr-4":{"ReThumbAdvanced\\ShortPixelLogger":"log\/src","ReThumbAdvanced\\Notices":"notices\/src","ReThumbAdvanced\\ShortQ":"shortq\/src"}}}

build/shortpixel/notices/src/NoticeController.php

@@ -139,6 +139,7 @@ public function getNotices()
   public function getNoticesForDisplay()
   {
       $newNotices = array();
+
       foreach(self::$notices as $notice)
       {
           if ($notice->isDismissed()) // dismissed never displays.

js/rta.js

@@ -226,9 +226,6 @@ rtaJS.prototype.doProcess = function()
 
     this.in_process = true;
     this.checkSubmitReady();
-    this.updateProgress();
-    this.togglePanel('progress', true);
-    this.processStoppable();
 
     this.togglePanel('progress', true);
     this.processStoppable();
@@ -289,21 +286,6 @@ rtaJS.prototype.doProcess = function()
 
 }
 
-// check if progress is stoppable  and activate stop process button, or not.
-rtaJS.prototype.processStoppable = function()
-{
-   var stoppable = false;
-
-    if (this.in_process)
-        stoppable = true;
-
-    if (stoppable)
-      $('.stop-process').prop('disabled', false);
-    else
-      $('.stop-process').prop('disabled', true);
-
-}
-
 // check if progress is stoppable  and activate stop process button, or not.
 rtaJS.prototype.processStoppable = function()
 {

scss/rta-admin-view.scss

@@ -414,4 +414,5 @@
 
   }
 
+
 } // class rta-admin

templates/admin/view_regenerate_process.php

@@ -29,12 +29,12 @@
               <text class="CircularProgressbar-text" x="50" y="50">0%</text>
               <text class="progress-count" x="50" y="70"><tspan class='current'>0</tspan> / <tspan class='total'>0</tspan></text>
           </svg>
-          <button class='button stop-process' disabled><?php _e('Stop Process', 'regenerate-thumbnails-advanced') ?></button>
        </div>
     </div>
 
     <div class="rta_status_box">
       <button class='button stop-process' disabled><?php _e('Stop Process', 'regenerate-thumbnails-advanced') ?></button>
+
         <div class="rta_notices rta_panel_off">
             <ul class="statuslist">
             </ul>
@@ -49,8 +49,6 @@
 
     </div>
 
-
-
     <?php
       $plugins = get_plugins();
       $spInstalled = isset($plugins['shortpixel-image-optimiser/wp-shortpixel.php']);