Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
mahara
mahara
Commits
c0c06120
Commit
c0c06120
authored
Dec 14, 2017
by
Cecilia Vela Gurovic
Committed by
Gerrit Code Review
Dec 14, 2017
Browse files
Merge "Bug 1737581: Disable copy collection button after first click"
parents
16f35685
84ee402c
Changes
6
Hide whitespace changes
Inline
Side-by-side
htdocs/js/mahara.js
View file @
c0c06120
...
...
@@ -139,7 +139,7 @@ function formStartProcessing(form, btn) {
processingStart
();
var
button
=
jQuery
(
btn
);
if
(
button
.
length
)
{
button
.
val
(
get_string
(
'
processing
'
)
+
'
...
'
);
button
.
text
(
get_string
(
'
processing
'
)
+
'
...
'
);
// we add a hidden input field so the "disabled" button still gets to
// pass its value through
...
...
@@ -149,7 +149,7 @@ function formStartProcessing(form, btn) {
});
button
.
after
(
node
);
button
.
attr
(
'
disabled
'
,
true
);
button
.
prop
(
'
disabled
'
,
true
);
button
.
blur
();
// Start the progress meter if it is enabled.
...
...
htdocs/js/viewmenu.js
View file @
c0c06120
...
...
@@ -110,9 +110,13 @@ jQuery(function($) {
$
(
"
#copy-view-button
"
).
on
(
'
click
'
,
function
()
{
// drop the collection bit from the url
var
url
=
copyurl
.
replace
(
/collection=
(
.*
)
/
,
''
);
$
(
this
).
text
(
get_string
(
'
processing
'
)
+
'
...
'
).
prop
(
'
disabled
'
,
true
).
blur
();
processingStart
();
window
.
location
=
url
;
});
$
(
"
#copy-collection-button
"
).
on
(
'
click
'
,
function
()
{
$
(
this
).
text
(
get_string
(
'
processing
'
)
+
'
...
'
).
prop
(
'
disabled
'
,
true
).
blur
();
processingStart
();
window
.
location
=
copyurl
;
});
...
...
htdocs/theme/raw/sass/components/_loading-inner.scss
View file @
c0c06120
...
...
@@ -6,5 +6,4 @@
}
.loading-message
{
margin-left
:
5px
;
display
:
none
;
}
\ No newline at end of file
htdocs/theme/raw/templates/header.tpl
View file @
c0c06120
...
...
@@ -55,7 +55,7 @@
<a
href=
"
{
$WWWROOT
}
admin/"
accesskey=
"a"
class=
"admin-site"
>
{
str
tag
=
"administration"
}
</a>
</div>
{/
if
}
<div
id=
"loading-box"
class=
"loading-box
"
style=
'display:none'
></div>
<div
id=
"loading-box"
class=
"loading-box
hidden"
></div>
</div>
<div
class=
"nav-toggle-area"
>
{
if
$MAINNAV
}
...
...
htdocs/theme/raw_old/sass/components/_loading-inner.scss
View file @
c0c06120
...
...
@@ -6,5 +6,4 @@
}
.loading-message
{
margin-left
:
5px
;
display
:
none
;
}
\ No newline at end of file
htdocs/theme/raw_old/templates/header.tpl
View file @
c0c06120
...
...
@@ -49,7 +49,7 @@
<img
src=
"
{
$sitelogosmall
}
"
alt=
"
{
$sitename
}
"
>
</a>
{/
if
}
<div
id=
"loading-box"
class=
"loading-box
"
style=
'display:none'
></div>
<div
id=
"loading-box"
class=
"loading-box
hidden"
></div>
</div>
{
if
$MAINNAV
}
<!-- Brand and toggle get grouped for better mobile display -->
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment