summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config.xml2
-rw-r--r--www/js/app.js19
2 files changed, 6 insertions, 15 deletions
diff --git a/config.xml b/config.xml
index 386347f6..0cecb0e5 100644
--- a/config.xml
+++ b/config.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<widget id="com.pliablepixels.zmninja" version="0.71" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="com.pliablepixels.zmninja" version="0.72" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>zmNinja</name>
<description>
High performance ZoneMinder client
diff --git a/www/js/app.js b/www/js/app.js
index 5df0278b..b10536ec 100644
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -126,17 +126,12 @@ angular.module('zmApp', [
// show an image-missing image FIXME: never seems to get called
$element.bind('error',function () {
-console.log ("***** IMAGE ELEMENT ERROR CALLED " + w + "x" + h);
- var w = $element.width();
- var h = $element.height();
-
- // using 20 here because it seems even a missing image will have ~18px width
- // after this error function has been called
- //if (w <= 20) { w = 100; }
- //if (h <= 20) { h = 100; }
+
+ loader.remove();
+ imageLoadingDataShare.set(0);
+
var url = 'img/novideo.png';
$element.prop('src', url);
- //$element.css('border', 'double 3px #cccccc');
});
function loadImage() {
@@ -146,11 +141,7 @@ console.log ("***** IMAGE ELEMENT ERROR CALLED " + w + "x" + h);
imageLoadingDataShare.set(0);
}
});
- //PP
- $element.bind('error', function(){
- loader.remove();
- imageLoadingDataShare.set(0);
- });
+