Raw 
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
=== modified file 'openlp/core/display/html/display.js'
--- openlp/core/display/html/display.js	2019-07-01 17:45:08 +0000
+++ openlp/core/display/html/display.js	2019-09-05 20:19:11 +0000
@@ -417,22 +417,25 @@
     }
     else {
       if (this._alertState === AlertState.Displaying) {
-        Display.addAlertToQueue(text, alert_settings);
-      }
-    }
-    var settings = JSON.parse(alertSettings);
-    this._alertSettings = settings;    
-    Display.setAlertText(text, settings.fontColor, settings.fontFace, settings.fontSize);
-    Display.setAlertLocation(settings.location);    
-    /* Check if the alert is a queued alert */
-    if (Display._alertState !== AlertState.DisplayingFromQueue) {
-      Display._alertState = AlertState.Displaying;
-    }
-    
-    alertBackground.addEventListener('transitionend', Display.alertTransitionEndEvent, false);            
-    alertText.addEventListener('animationend', Display.alertAnimationEndEvent, false);                          
-    
-    Display.showAlertBackground(settings.backgroundColor);                
+        Display.addAlertToQueue(text, alertSettings);
+      }
+      else
+      {
+        var settings = JSON.parse(alertSettings);
+        this._alertSettings = settings;
+        Display.setAlertText(text, settings.fontColor, settings.fontFace, settings.fontSize);
+        Display.setAlertLocation(settings.location);    
+        /* Check if the alert is a queued alert */
+        if (Display._alertState !== AlertState.Displaying) {
+          Display._alertState = AlertState.Displaying;
+        }
+        
+        alertBackground.addEventListener('transitionend', Display.alertTransitionEndEvent, false);            
+        alertText.addEventListener('animationend', Display.alertAnimationEndEvent, false);                          
+        
+        Display.showAlertBackground(settings.backgroundColor);                
+      }
+    }
   },  
   /**
    * Add an alert to the alert queue 
@@ -460,7 +463,7 @@
    */
   alertTransitionEndEvent: function (e) {
     e.stopPropagation();
-    console.debug("Transition end event reached");    
+    console.debug("Transition end event reached: " + Display._transitionState);    
     if (Display._transitionState === TransitionState.EntranceTransition) {        
       Display._transitionState = TransitionState.NoTransition;
       Display.showAlertText(Display._alertSettings);      
@@ -469,10 +472,7 @@
       Display._transitionState = TransitionState.NoTransition;      
       Display.removeAlertLocation(Display._alertSettings.location);
       Display.clearAlertSettings();      
-      setTimeout(function () {        
-        Display.showNextAlert();
-      }, AlertDelay.OnePointFiveSeconds);
-              
+      Display.showNextAlert();
     }    
   },
   /**