diff options
Diffstat (limited to 'www')
| -rw-r--r-- | www/.DS_Store | bin | 6148 -> 6148 bytes | |||
| -rw-r--r-- | www/img/.DS_Store | bin | 0 -> 6148 bytes | |||
| -rw-r--r-- | www/img/novideo.psd | bin | 0 -> 889147 bytes | |||
| -rw-r--r-- | www/js/app.js | 17 | ||||
| -rw-r--r-- | www/templates/montage.html | 5 |
5 files changed, 18 insertions, 4 deletions
diff --git a/www/.DS_Store b/www/.DS_Store Binary files differindex bf8f7220..5526f097 100644 --- a/www/.DS_Store +++ b/www/.DS_Store diff --git a/www/img/.DS_Store b/www/img/.DS_Store Binary files differnew file mode 100644 index 00000000..ddf5f378 --- /dev/null +++ b/www/img/.DS_Store diff --git a/www/img/novideo.psd b/www/img/novideo.psd Binary files differnew file mode 100644 index 00000000..18cc32e0 --- /dev/null +++ b/www/img/novideo.psd diff --git a/www/js/app.js b/www/js/app.js index eaedae7c..5df0278b 100644 --- a/www/js/app.js +++ b/www/js/app.js @@ -114,6 +114,7 @@ angular.module('zmApp', [ } imageLoadingDataShare.set(1); loadImage(); + $attributes.$observe('imageSpinnerSrc', function(value){ //console.log ("SOURCE CHANGED"); imageLoadingDataShare.set(1); @@ -121,6 +122,22 @@ angular.module('zmApp', [ //deregistration(); }); + + + // 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; } + var url = 'img/novideo.png'; + $element.prop('src', url); + //$element.css('border', 'double 3px #cccccc'); + }); function loadImage() { $element.bind("load", function (e) { diff --git a/www/templates/montage.html b/www/templates/montage.html index df9ea17c..eee66555 100644 --- a/www/templates/montage.html +++ b/www/templates/montage.html @@ -52,10 +52,7 @@ /> - <div id="div-$index" ng-if="showSizeButtons" style= "position:absolute;top:0; left:0; width:100%; height:100%; background-color:red;z-index:100"> - HELLO - - </div> + </article> </span> |