Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
our_own_cloud_project
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
die_coolen_jungs
our_own_cloud_project
Commits
122c3a3c
Commit
122c3a3c
authored
Aug 3, 2011
by
Robin Appelman
Browse files
Options
Downloads
Patches
Plain Diff
dont show confusing 'X files scanned' message when we are not scanning files
parent
93b342ee
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
apps/media/js/collection.js
+1
-1
1 addition, 1 deletion
apps/media/js/collection.js
apps/media/js/scanner.js
+2
-0
2 additions, 0 deletions
apps/media/js/scanner.js
apps/media/templates/collection.php
+2
-2
2 additions, 2 deletions
apps/media/templates/collection.php
with
5 additions
and
3 deletions
apps/media/js/collection.js
+
1
−
1
View file @
122c3a3c
...
...
@@ -33,7 +33,7 @@ Collection={
Collection
.
loadedListeners
[
i
]();
}
if
(
collection
.
length
==
0
){
$
(
'
#scan input.start
'
).
val
(
'
Scan
'
);
$
(
'
#scan input.start
'
).
val
(
'
Scan
Collection
'
);
$
(
'
#plugins a[href="#collection"]
'
).
trigger
(
'
click
'
);
}
...
...
This diff is collapsed.
Click to expand it.
apps/media/js/scanner.js
+
2
−
0
View file @
122c3a3c
...
...
@@ -50,6 +50,7 @@ Scanner={
},
start
:
function
(
ready
){
Scanner
.
stopScanning
=
false
;
$
(
'
#scancount
'
).
show
();
var
scanSong
=
function
(){
Scanner
.
currentIndex
++
;
if
(
!
Scanner
.
stopScanning
&&
Scanner
.
currentIndex
<
Scanner
.
songs
.
length
){
...
...
@@ -62,6 +63,7 @@ Scanner={
}
}
scanSong
();
scanSong
();
},
toggle
:
function
(){
if
(
Scanner
.
stopScanning
){
...
...
This diff is collapsed.
Click to expand it.
apps/media/templates/collection.php
+
2
−
2
View file @
122c3a3c
<div
id=
'scan'
>
<p><span
class=
'songCount'
>
0
</span>
Songs scanned
</p>
<p
id=
'scancount'
style=
'display:none'
><span
class=
'songCount'
>
0
</span>
Songs scanned
</p>
<div
id=
"scanprogressbar"
></div>
<input
type=
'button'
class=
'start'
value=
'Recan'
></input>
<input
type=
'button'
class=
'start'
value=
'Recan
Collection
'
></input>
<input
type=
'button'
class=
'stop'
style=
'display:none'
value=
'Pause'
></input>
</div>
<ul
id=
'collection'
>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment