Skip to content

Commit

Permalink
Revert "MDL-36002 core: Make drag and drop keyboard friendly"
Browse files Browse the repository at this point in the history
This reverts commit 7c271b9, 313e585, ade4695, and 70b4027

Conflicts:
	theme/bootstrapbase/style/moodle.css
  • Loading branch information
Sam Hemelryk committed Aug 15, 2013
1 parent ae19c68 commit 702d1f8
Show file tree
Hide file tree
Showing 16 changed files with 14 additions and 312 deletions.
3 changes: 0 additions & 3 deletions course/lib.php
Original file line number Diff line number Diff line change
Expand Up @@ -2977,9 +2977,6 @@ function include_course_ajax($course, $usedmodules = array(), $enabledmodules =
'markedthistopic',
'move',
'movesection',
'movecontent',
'aftercontent',
'emptydragdropregion'
), 'moodle');

// Include format-specific strings
Expand Down
1 change: 0 additions & 1 deletion course/yui/dragdrop/dragdrop.js
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,6 @@ YUI.add('moodle-course-dragdrop', function(Y) {
resources.addClass(CSS.SECTION);
sectionnode.one('.'+CSS.CONTENT+' div.'+CSS.SUMMARY).insert(resources, 'after');
}
resources.setAttribute('data-draggroups', this.groups.join(' '));
// Define empty ul as droptarget, so that item could be moved to empty list
var tar = new Y.DD.Drop({
node: resources,
Expand Down
3 changes: 0 additions & 3 deletions lang/en/moodle.php
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,6 @@
$string['advanced'] = 'Advanced';
$string['advancedfilter'] = 'Advanced search';
$string['advancedsettings'] = 'Advanced settings';
$string['aftercontent'] = 'After {$a}';
$string['again'] = 'again';
$string['aimid'] = 'AIM ID';
$string['ajaxuse'] = 'AJAX and Javascript';
Expand Down Expand Up @@ -646,7 +645,6 @@
An email containing your new password has been sent to your address at<br /><b>{$a->email}</b>.<br />
The new password was automatically generated - you might like to
<a href="{$a->link}">change your password</a> to something easier to remember.';
$string['emptydragdropregion'] = 'empty region';
$string['enable'] = 'Enable';
$string['encryptedcode'] = 'Encrypted code';
$string['english'] = 'English';
Expand Down Expand Up @@ -1082,7 +1080,6 @@
$string['moreprofileinfoneeded'] = 'Please tell us more about yourself';
$string['mostrecently'] = 'most recently';
$string['move'] = 'Move';
$string['movecontent'] = 'Move {$a}';
$string['movecategorycontentto'] = 'Move into';
$string['movecategoryto'] = 'Move category to:';
$string['movecontentstoanothercategory'] = 'Move contents to another category';
Expand Down
5 changes: 0 additions & 5 deletions lib/outputrequirementslib.php
Original file line number Diff line number Diff line change
Expand Up @@ -300,11 +300,6 @@ protected function init_requirements_data(moodle_page $page, core_renderer $rend
if (!empty($page->cm->id)) {
$params['cmid'] = $page->cm->id;
}
// Strings for drag and drop.
$this->strings_for_js(array('movecontent',
'aftercontent',
'emptydragdropregion'),
'moodle');
$page->requires->yui_module('moodle-core-blocks', 'M.core_blocks.init_dragdrop', array($params), null, true);
}
}
Expand Down
5 changes: 2 additions & 3 deletions lib/yui/build/moodle-core-blocks/moodle-core-blocks-debug.js
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ Y.extend(DRAGBLOCK, M.core.dragdrop, {
blocklist.each(function(blocknode) {
var move = blocknode.one('a.'+CSS.EDITINGMOVE);
if (move) {
move.replace(this.get_drag_handle(move.getAttribute('title'), '', 'icon', true));
move.remove();
blocknode.one('.'+CSS.HEADER).setStyle('cursor', 'move');
}
}, this);
Expand Down Expand Up @@ -379,8 +379,7 @@ M.core.blockdraganddrop.init = function(params) {
M.core_blocks = M.core_blocks || {};
M.core_blocks.init_dragdrop = function(params) {
M.core.blockdraganddrop.init(params);
};
/**
};/**
* This file contains the drag and drop manager class.
*
* Provides drag and drop functionality for blocks.
Expand Down
4 changes: 2 additions & 2 deletions lib/yui/build/moodle-core-blocks/moodle-core-blocks-min.js

Large diffs are not rendered by default.

5 changes: 2 additions & 3 deletions lib/yui/build/moodle-core-blocks/moodle-core-blocks.js
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ Y.extend(DRAGBLOCK, M.core.dragdrop, {
blocklist.each(function(blocknode) {
var move = blocknode.one('a.'+CSS.EDITINGMOVE);
if (move) {
move.replace(this.get_drag_handle(move.getAttribute('title'), '', 'icon', true));
move.remove();
blocknode.one('.'+CSS.HEADER).setStyle('cursor', 'move');
}
}, this);
Expand Down Expand Up @@ -379,8 +379,7 @@ M.core.blockdraganddrop.init = function(params) {
M.core_blocks = M.core_blocks || {};
M.core_blocks.init_dragdrop = function(params) {
M.core.blockdraganddrop.init(params);
};
/**
};/**
* This file contains the drag and drop manager class.
*
* Provides drag and drop functionality for blocks.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,6 @@ Y.extend(DIALOGUE, Y.Panel, {
this.render();
this.show();
this.after('visibleChange', this.visibilityChanged, this);
if (config.center) {
this.centerDialogue();
}
if (!config.visible) {
this.hide();
}
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,6 @@ Y.extend(DIALOGUE, Y.Panel, {
this.render();
this.show();
this.after('visibleChange', this.visibilityChanged, this);
if (config.center) {
this.centerDialogue();
}
if (!config.visible) {
this.hide();
}
Expand Down
Loading

0 comments on commit 702d1f8

Please sign in to comment.