diff options
| author | Côme BERNIGAUD <come.bernigaud@laposte.net> | 2011-08-25 09:07:02 +0200 |
|---|---|---|
| committer | Côme BERNIGAUD <come.bernigaud@laposte.net> | 2011-08-25 09:07:02 +0200 |
| commit | df560b3d9d513e7b01c95745ae70a2151c2375fc (patch) | |
| tree | b23454b6b14704f0a1b8a3c27bc5adda65cef376 /apps/media/js/collection.js | |
| parent | 3fbc8973eee869c04c507f549f6388b47ea9134d (diff) | |
| parent | 46af991574a3bcec70cb6123f35eb85587d0e0c8 (diff) | |
| download | nextcloud-server-df560b3d9d513e7b01c95745ae70a2151c2375fc.tar.gz nextcloud-server-df560b3d9d513e7b01c95745ae70a2151c2375fc.zip | |
Merge branch 'master' of git://anongit.kde.org/owncloud
Conflicts:
apps/media/js/collection.js
Diffstat (limited to 'apps/media/js/collection.js')
| -rw-r--r-- | apps/media/js/collection.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/media/js/collection.js b/apps/media/js/collection.js index 72100927a5f..5c04313d143 100644 --- a/apps/media/js/collection.js +++ b/apps/media/js/collection.js @@ -55,7 +55,7 @@ Collection={ for(var i=0;i<Collection.loadedListeners.length;i++){ Collection.loadedListeners[i](); } - if(Collection.length==0){ + if(data.songs[i].length==0){ $('#scan input.start').val(t('media','Scan Collection')); $('#scan input.start').click(); } |