Skip to content
GitLab
Menu
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
baa08519
Commit
baa08519
authored
Jul 27, 2015
by
Robert Lyon
Committed by
Gerrit Code Review
Jul 27, 2015
Browse files
Merge "Fixing problems with block picker (Bug #1466700)"
parents
9149bdd0
490d9a9f
Changes
1
Hide whitespace changes
Inline
Side-by-side
htdocs/js/views.js
View file @
baa08519
...
...
@@ -441,6 +441,10 @@
}
else
{
blockinstance
.
find
(
'
.deletebutton
'
).
focus
();
}
},
function
()
{
// On error callback we need to reset the Dock
hideDock
();
});
}
...
...
@@ -698,7 +702,7 @@
}
dialog
.
find
(
'
.dock-loading
'
).
remove
();
inputcontainer
.
append
(
result
);
inputcontainer
.
html
(
''
).
append
(
result
);
firstcell
=
inputcontainer
.
find
(
'
input
'
).
first
();
firstcell
.
prop
(
'
checked
'
,
true
);
...
...
@@ -920,7 +924,7 @@
var
addblockdialog
=
$
(
'
#addblock
'
);
options
.
trigger
=
e
.
type
;
addblockdialog
.
addClass
(
'
hidden
'
).
trigger
(
'
dialog.end
'
,
options
);
addblockdialog
.
addClass
(
'
hidden
'
).
addClass
(
'
closed
'
).
trigger
(
'
dialog.end
'
,
options
);
}
...
...
Write
Preview
Supports
Markdown
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