summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan-Christoph Borchardt <JanCBorchardt@fsfe.org>2011-08-13 07:02:51 +0200
committerJan-Christoph Borchardt <JanCBorchardt@fsfe.org>2011-08-13 07:02:51 +0200
commitc144976676efc829b6a2e884ea2bb4d2bfebb733 (patch)
tree77b5e327bd86dfc609da6e1dd9713fd7b241bbc1
parentccf410c7b0f7f70f39c0d842c5a30df2664db0f3 (diff)
downloadnextcloud-server-c144976676efc829b6a2e884ea2bb4d2bfebb733.tar.gz
nextcloud-server-c144976676efc829b6a2e884ea2bb4d2bfebb733.zip
start scanning music automatically when in Music
-rw-r--r--apps/media/js/collection.js4
-rw-r--r--apps/media/templates/music.php7
2 files changed, 6 insertions, 5 deletions
diff --git a/apps/media/js/collection.js b/apps/media/js/collection.js
index 8ef10951b6b..15c83b86229 100644
--- a/apps/media/js/collection.js
+++ b/apps/media/js/collection.js
@@ -244,12 +244,12 @@ $(document).ready(function(){
Collection.parent=$('#collection');
Collection.load();
Collection.parent.hide();
- $('#scan input.start').click(function(){
+ //$('#scan input.start').click(function(){
$('#scan input.start').hide();
$('#scan input.stop').show();
$('#scan input.stop').click(function(){
Scanner.toggle();
});
Scanner.scanCollection();
- });
+ //});
});
diff --git a/apps/media/templates/music.php b/apps/media/templates/music.php
index d3917ac8137..9c31ddd288a 100644
--- a/apps/media/templates/music.php
+++ b/apps/media/templates/music.php
@@ -24,10 +24,11 @@
<div id="rightcontent">
<div id="scan">
- <p id="scancount" style="display:none"><span class="songCount">0</span> <?php echo $l->t('Songs scanned')?></p>
- <div id="scanprogressbar"></div>
+ <p id="scancount" style="display:none"><span class="songCount">0</span> <?php echo $l->t('Songs scanned')?>
<input type="button" class="start" value="<?php echo $l->t('Rescan Collection')?>"></input>
- <input type="button" class="stop" style="display:none" value="<?php echo $l->t('Pause')?>"></input>
+ <input type="button" class="stop" style="display:none" value="<?php echo $l->t('Pause')?>"></input></p>
+ <div id="scanprogressbar"></div>
+
</div>
<table id="collection">
<thead>