Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
mahara
mahara
Commits
4a3e723b
Commit
4a3e723b
authored
Sep 20, 2019
by
Robert Lyon
Committed by
Gerrit Code Review
Sep 20, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge "Bug 1843351: Stop the multi-click on add block causing multi save"
parents
c2c934b6
e29cbe06
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
16 deletions
+21
-16
htdocs/js/views.js
htdocs/js/views.js
+20
-15
htdocs/view/blocks.php
htdocs/view/blocks.php
+1
-1
No files found.
htdocs/js/views.js
View file @
4a3e723b
...
...
@@ -476,27 +476,30 @@
});
}
var
addblockstarted
=
false
;
// To stop the double clicking of add block button causing multiple saving problem
function
startAddBlock
(
element
)
{
var
addblockdialog
=
$
(
'
#addblock
'
);
addblockdialog
.
modal
(
'
show
'
);
addblockdialog
.
one
(
'
dialog.end
'
,
function
(
event
,
options
)
{
if
(
options
.
saved
)
{
addNewBlock
(
options
,
element
.
find
(
'
.blocktype-radio
'
).
val
());
}
if
(
!
addblockstarted
)
{
addblockstarted
=
true
;
addblockdialog
.
one
(
'
dialog.end
'
,
function
(
event
,
options
)
{
if
(
options
.
saved
)
{
addNewBlock
(
options
,
element
.
find
(
'
.blocktype-radio
'
).
val
());
}
else
{
element
.
trigger
(
"
focus
"
);
}
});
element
.
trigger
(
"
focus
"
);
}
});
addblockdialog
.
find
(
'
h4.modal-title
'
).
text
(
get_string
(
'
addblock
'
,
'
view
'
,
element
.
text
()
));
computeColumnInputs
(
addblockdialog
);
addblockdialog
.
find
(
'
.block-inner
'
).
removeClass
(
'
d-none
'
);
addblockdialog
.
find
(
'
.cell-chooser input:first
'
).
prop
(
'
checked
'
,
true
);
addblockdialog
.
find
(
'
.cell-chooser input:first
'
).
parent
().
addClass
(
'
focused active
'
);
addblockdialog
.
find
(
'
h4.modal-title
'
).
text
(
get_string
(
'
add
new
block
'
,
'
view
'
));
computeColumnInputs
(
addblockdialog
);
addblockdialog
.
find
(
'
.block-inner
'
).
removeClass
(
'
d-none
'
);
addblockdialog
.
find
(
'
.cell-chooser input:first
'
).
prop
(
'
checked
'
,
true
);
addblockdialog
.
find
(
'
.cell-chooser input:first
'
).
parent
().
addClass
(
'
focused active
'
);
addblockdialog
.
find
(
'
.deletebutton
'
).
trigger
(
"
focus
"
);
keytabbinginadialog
(
addblockdialog
,
addblockdialog
.
find
(
'
.deletebutton
'
),
addblockdialog
.
find
(
'
.cancel
'
));
addblockdialog
.
find
(
'
.deletebutton
'
).
trigger
(
"
focus
"
);
keytabbinginadialog
(
addblockdialog
,
addblockdialog
.
find
(
'
.deletebutton
'
),
addblockdialog
.
find
(
'
.cancel
'
));
}
}
function
makeExistingBlocksSortable
()
{
...
...
@@ -587,6 +590,8 @@
}
function
addNewBlock
(
whereTo
,
blocktype
)
{
addblockstarted
=
false
;
var
pd
=
{
'
id
'
:
$
(
'
#viewid
'
).
val
(),
'
change
'
:
1
,
...
...
htdocs/view/blocks.php
View file @
4a3e723b
...
...
@@ -210,7 +210,7 @@ if ($placeholderblock) {
$smarty
=
smarty
(
$javascript
,
$stylesheets
,
array
(
'view'
=>
array
(
'addblock'
,
'add
new
block'
,
'cellposition'
,
'blockordertopcell'
,
'blockorderafter'
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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