summaryrefslogtreecommitdiff
path: root/www/js
diff options
context:
space:
mode:
authorPliablePixels <pliablepixels@gmail.com>2015-08-17 20:10:17 -0400
committerPliablePixels <pliablepixels@gmail.com>2015-08-17 20:10:17 -0400
commitbf09a5cf7326902bbf69157e5f8dfc8bbcf301b6 (patch)
tree6eb71457e4ff1713f715936231afd2bc6234a51a /www/js
parentf073cdda22715b0463b7a3ec48b75cd7fa43938a (diff)
shows icon if no video connection - hopefully also fixes android bouncing images
Diffstat (limited to 'www/js')
-rw-r--r--www/js/app.js19
1 files changed, 5 insertions, 14 deletions
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);
- });
+