summaryrefslogtreecommitdiff
path: root/www/templates/montage.html
diff options
context:
space:
mode:
authorpliablepixels <pliablepixels@gmail.com>2016-03-20 08:21:49 -0400
committerpliablepixels <pliablepixels@gmail.com>2016-03-20 08:21:49 -0400
commite885fa3ed2cdb1ce0c7b108df168decedc1525b3 (patch)
treeec374d0a3ce3a1ff395967aa167d56b962ee30d0 /www/templates/montage.html
parentcf953db5386051f2c603c85867f6510cd0870b06 (diff)
fixed keyboard plugin, tweaking packery - seems calling resize helps
Former-commit-id: 711388615e23416b3956058b7f15909355b7a3ff
Diffstat (limited to 'www/templates/montage.html')
-rw-r--r--www/templates/montage.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/www/templates/montage.html b/www/templates/montage.html
index 9d2837a5..2b3667a1 100644
--- a/www/templates/montage.html
+++ b/www/templates/montage.html
@@ -44,7 +44,7 @@
<div class="grid-item grid-item-{{monitor.Monitor.gridScale}} {{dragBorder}}" data-item-id="{{monitor.Monitor.Id}}" data-item-size="{{monitor.Monitor.gridScale}}" data-item-listdisplay="{{monitor.Monitor.listDisplay}}" >
<figure>
<div ng-if="!isModalActive" >
- <div ng-if="$root.authSession!='undefined' && !isBackground()">
+ <div ng-if="$root.authSession!='undefined' && !isBackground() && !areImagesLoading">
<div ng-if = "!minimal">
<div>
<img class="{{monitor.Monitor.selectStyle}}" id="img-{{$index}}" image-spinner-src="{{LoginData.streamingurl}}/nph-zms?mode=single&monitor={{monitor.Monitor.Id}}&scale={{LoginData.montageQuality}}{{$root.authSession}}&rand={{$root.rand}}" ng-click="!isDragabillyOn?openModal(monitor.Monitor.Id, monitor.Monitor.Controllable, monitor.Monitor.ControlId, monitor.Monitor.connKey):toggleSelectItem($index);" image-spinner-loader="lines" on-swipe-up="swipeUp()" on-swipe-down="swipeDown()" />
@@ -60,7 +60,7 @@
</div>
</div>
- <div ng-if="!$root.authSession=='undefined' || isBackground()">
+ <div ng-if="!$root.authSession=='undefined' || isBackground() || areImagesLoading">
<img image-spinner-src="img/pausevideo.png" />
</div>