Player: use reportFault second param object for setting targetId (#2117)

* Player: use reportFault second param object for setting targetId
relates to xibosignageltd/xibo-private#264

* Player: call xiboIC.expireNow when data is not found after XHR request
relates to xibosignageltd/xibo-private#264

modules/src/player.js

@@ -152,15 +152,15 @@ $(function() {
         xiboIC.reportFault({
           code: '5001',
           reason: 'No Data',
-        });
+        }, {targetId: widget.widgetId});
       }
 
       onDataError(httpStatus, response);
     } else {
       xiboIC.reportFault({
         code: '5001',
         reason: 'No Data',
-      });
+      }, {targetId: widget.widgetId});
     }
   }
 
@@ -191,10 +191,18 @@ $(function() {
             onDataErrorCallback(widget, data.error, data);
           }
 
+          if (Array.isArray(data) && data.length === 0) {
+            xiboIC.expireNow({targetId: xiboICTargetId});
+          }
+
           resolve(data);
         }).fail(function(jqXHR, textStatus, errorThrown) {
           onDataErrorCallback(widget, jqXHR.status, jqXHR.responseJSON);
           console.log(jqXHR, textStatus, errorThrown);
+
+          if (jqXHR.status === 404) {
+            xiboIC.expireNow({targetId: xiboICTargetId});
+          }
         });
       } else {
         resolve(null);
@@ -284,10 +292,6 @@ $(function() {
     widget.items = [];
     const $target = $('body');
 
-    if (dataItems.length === 0 && showError) {
-      xiboIC.expireNow({targetId: widget.widgetId});
-    }
-
     if (showError && data?.message) {
       $target.append(
         '<div class="error-message" role="alert">' +
@@ -335,7 +339,7 @@ $(function() {
 
         // IF we added item template
         templateAlreadyAdded = true;
-      };
+      }
 
       // Add item to the widget object
       (item) && widget.items.push(item);
@@ -486,10 +490,6 @@ $(function() {
     dataItems,
     showError,
   ) {
-    if (dataItems.length === 0 && showError) {
-      xiboIC.expireNow({targetId: widget.widgetId});
-    }
-
     // Parse out the template with elements.
     if (elements?.length > 0) {
       const $content = $('#content');