Commit 83069d9e authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review

Merge "Purge MochiKit from mahara.js (Bug #1323920)"

parents 5533c626 174ca581
......@@ -159,10 +159,10 @@ function editform(item) {
// A text field for the name
var label = LABEL({'for':'name'+item.id,'class':'accessible-hidden'}, null, item.label);
var name = INPUT({'type':'text','class':'text form-control input-sm','id':'name'+item.id,'value':item.name});
connect(name, 'onkeydown', function(e) {
if (keypressKeyCode(e) == 13) {
jQuery(name).keydown(function(e) {
if (e.keyCode == 13) {
signal(save, 'onclick');
e.stop();
e.preventDefault();
}
});
var parentspan = createDOM('span',null,label,name);
......
......@@ -14,6 +14,7 @@ function Slideshow(id, count) {
$j("#description_" + id + "_" + this.current).css('display', 'none');
}
$j(this.id).height($j(this.id + " img:eq(" + this.current + ")").height() + 10);
isPageRendering = true;
$j(this.id + " img:eq(" + this.current + ")").fadeOut(500, function() {
var extraheight = 0;
self.current = to;
......@@ -23,6 +24,7 @@ function Slideshow(id, count) {
}
$j(self.id).height($j(self.id + " img:eq(" + self.current + ")").height() + extraheight + 10);
$j(self.id + " img:eq(" + self.current + ")").fadeIn(500);
isPageRendering = false;
});
$j(this.id + ' td.control span').removeClass('disabled');
if (to == 0) {
......
......@@ -113,12 +113,7 @@ function FileBrowser(idprefix, folderid, config, globalconfig) {
if ($(self.id + '_userfile').files) {
for (var i = 0; i < $(self.id + '_userfile').files.length; ++ i) {
self.nextupload++;
if (is_FF()) {
var localname = $(self.id + '_userfile').files[i].name;
}
else {
var localname = $(self.id + '_userfile').files[i].fileName;
}
var localname = $(self.id + '_userfile').files[i].name;
var message = makeMessage(DIV(null,
SPAN({'class': 'icon-spinner icon-pulse icon icon-lg'}), ' ',
get_string('uploadingfiletofolder',localname,self.foldername)
......
......@@ -474,11 +474,6 @@ function auth_setup () {
if (defined('JSON')) {
json_reply('global', get_string('sessiontimedoutreload'), 1);
}
if (defined('IFRAME')) {
header('Content-type: text/html');
print_auth_frame();
exit;
}
// If the page the user is viewing is public, inform them that they can
// log in again
......
This diff is collapsed.
......@@ -112,8 +112,3 @@ function print_meta_redirect($url, $title = 'Mahara Redirect') {
print "<title>$title</title>";
print '</head><body><p>Please follow <a href="'.$url.'">link</a>!</p></body></html>';
}
function print_auth_frame() {
$frame = '<html><head></head><body onload="parent.show_login_form(\'ajaxlogin_iframe\')"></body></html>';
echo $frame;
}
......@@ -2228,7 +2228,7 @@ function get_help_icon($plugintype, $pluginname, $form, $element, $page='', $sec
$content = get_string('Help');
}
return ' <span class="help"><a href="" title="' . get_string('Help') . '" onclick="'.
return ' <span class="help"><a href="#" title="' . get_string('Help') . '" onclick="'.
hsc(
'contextualHelp(' . json_encode($form) . ',' .
json_encode($element) . ',' . json_encode($plugintype) . ',' .
......
......@@ -62,7 +62,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>
{include file="header/topright.tpl"}
......
......@@ -32,10 +32,10 @@
<tr>
<td colspan="3"></td>
<td class="center">
<a href="" onclick="toggleChecked('tocheckread'); return false;">{str section='activity' tag='selectall'}<span class="accessible-hidden sr-only"> {str section='activity' tag='selectallread'}</span></a>
<a href="" data-togglecheckbox="tocheckread">{str section='activity' tag='selectall'}<span class="accessible-hidden sr-only"> {str section='activity' tag='selectallread'}</span></a>
</td>
<td class="center">
<a href="" onclick="toggleChecked('tocheckdel'); return false;">{str section='activity' tag='selectall'} <span class="accessible-hidden sr-only">{str section='activity' tag='selectalldelete'}</span></a>
<a href="" data-togglecheckbox="tocheckdel">{str section='activity' tag='selectall'} <span class="accessible-hidden sr-only">{str section='activity' tag='selectalldelete'}</span></a>
</td>
</tr>
</tfoot>
......
......@@ -65,16 +65,16 @@
{{$name}}_searchfunc({});
connect('{{$name}}_search', 'onkeypress', function (k) {
if (keypressKeyCode(k) == 13) {
jQuery('#{{$name}}_search').keypress(function(k) {
if (k.keyCode == 13) {
{{$name}}_searchfunc({'query': $('{{$name}}_search').value});
k.stop();
k.preventDefault();
}
});
connect('{{$name}}_search_btn', 'onclick', function(e) {
jQuery('{{$name}}_search_btn').click(function(e) {
{{$name}}_searchfunc({'query': $('{{$name}}_search').value});
e.stop();
e.preventDefault();
});
});
......
......@@ -91,6 +91,7 @@ Scenario: Creating a plan with 11 tasks (Bug #1503036)
And I choose "Pages" in "Portfolio"
And I press "Create page"
And I press "Save"
And I wait "5" seconds
And I expand "General" node
And I wait "1" seconds
And I follow "Plans" in the "div#general" "css_element"
......@@ -104,4 +105,4 @@ Scenario: Creating a plan with 11 tasks (Bug #1503036)
And I follow "Next page"
Then I should see "Build utopia"
And I follow "Next page"
Then I should see "Social collapse"
\ No newline at end of file
Then I should see "Social collapse"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment