MDL-40759 dragdrop: Use a pix icon renderer for drag handles.

eSrem · Mar 17, 2017 · e6bf10c · e6bf10c
1 parent d3d2f09
commit e6bf10c
Show file tree

Hide file tree

Showing 21 changed files with 70 additions and 100 deletions.
diff --git a/...ool/lp/yui/build/moodle-tool_lp-dragdrop-reorder/moodle-tool_lp-dragdrop-reorder-debug.js b/...ool/lp/yui/build/moodle-tool_lp-dragdrop-reorder/moodle-tool_lp-dragdrop-reorder-debug.js
@@ -28,8 +28,6 @@ Y.extend(DRAGREORDER, M.core.dragdrop, {
         this.samenodeclass = args.sameNodeClass;
         this.parentnodeclass = args.parentNodeClass;
         this.draghandleinsertclass = args.dragHandleInsertClass;
-        this.draghandle = this.get_drag_handle(args.dragHandleText,
-                CSS.EDITINGMOVE, CSS.ICONCLASS, true);
 
         this.samenodelabel = args.sameNodeLabel;
         this.parentnodelabel = args.parentNodeLabel;
@@ -49,7 +47,8 @@ Y.extend(DRAGREORDER, M.core.dragdrop, {
          .all('.' + args.dragHandleInsertClass)
          .each(
             function(node) {
-                node.insert(this.draghandle.cloneNode(true));
+                var draghandle = this.get_drag_handle(args.dragHandleText, CSS.EDITINGMOVE, CSS.ICONCLASS, true);
+                node.insert(draghandle);
             }, this);
     },
 

diff --git a/.../tool/lp/yui/build/moodle-tool_lp-dragdrop-reorder/moodle-tool_lp-dragdrop-reorder-min.js b/.../tool/lp/yui/build/moodle-tool_lp-dragdrop-reorder/moodle-tool_lp-dragdrop-reorder-min.js
diff --git a/admin/tool/lp/yui/build/moodle-tool_lp-dragdrop-reorder/moodle-tool_lp-dragdrop-reorder.js b/admin/tool/lp/yui/build/moodle-tool_lp-dragdrop-reorder/moodle-tool_lp-dragdrop-reorder.js
@@ -28,8 +28,6 @@ Y.extend(DRAGREORDER, M.core.dragdrop, {
         this.samenodeclass = args.sameNodeClass;
         this.parentnodeclass = args.parentNodeClass;
         this.draghandleinsertclass = args.dragHandleInsertClass;
-        this.draghandle = this.get_drag_handle(args.dragHandleText,
-                CSS.EDITINGMOVE, CSS.ICONCLASS, true);
 
         this.samenodelabel = args.sameNodeLabel;
         this.parentnodelabel = args.parentNodeLabel;
@@ -49,7 +47,8 @@ Y.extend(DRAGREORDER, M.core.dragdrop, {
          .all('.' + args.dragHandleInsertClass)
          .each(
             function(node) {
-                node.insert(this.draghandle.cloneNode(true));
+                var draghandle = this.get_drag_handle(args.dragHandleText, CSS.EDITINGMOVE, CSS.ICONCLASS, true);
+                node.insert(draghandle);
             }, this);
     },
 

diff --git a/admin/tool/lp/yui/src/dragdrop-reorder/js/dragdropreorder.js b/admin/tool/lp/yui/src/dragdrop-reorder/js/dragdropreorder.js
@@ -26,8 +26,6 @@ Y.extend(DRAGREORDER, M.core.dragdrop, {
         this.samenodeclass = args.sameNodeClass;
         this.parentnodeclass = args.parentNodeClass;
         this.draghandleinsertclass = args.dragHandleInsertClass;
-        this.draghandle = this.get_drag_handle(args.dragHandleText,
-                CSS.EDITINGMOVE, CSS.ICONCLASS, true);
 
         this.samenodelabel = args.sameNodeLabel;
         this.parentnodelabel = args.parentNodeLabel;
@@ -47,7 +45,8 @@ Y.extend(DRAGREORDER, M.core.dragdrop, {
          .all('.' + args.dragHandleInsertClass)
          .each(
             function(node) {
-                node.insert(this.draghandle.cloneNode(true));
+                var draghandle = this.get_drag_handle(args.dragHandleText, CSS.EDITINGMOVE, CSS.ICONCLASS, true);
+                node.insert(draghandle);
             }, this);
     },
 

diff --git a/course/yui/build/moodle-course-dragdrop/moodle-course-dragdrop-debug.js b/course/yui/build/moodle-course-dragdrop/moodle-course-dragdrop-debug.js
@@ -329,8 +329,6 @@ Y.extend(DRAGRESOURCE, M.core.dragdrop, {
         this.groups = ['resource'];
         this.samenodeclass = CSS.ACTIVITY;
         this.parentnodeclass = CSS.SECTION;
-        this.resourcedraghandle = this.get_drag_handle(M.util.get_string('movecoursemodule', 'moodle'),
-                CSS.EDITINGMOVE, CSS.ICONCLASS, true);
 
         this.samenodelabel = {
             identifier: 'afterresource',
@@ -424,7 +422,8 @@ Y.extend(DRAGRESOURCE, M.core.dragdrop, {
             var move = resourcesnode.one('a.' + CSS.EDITINGMOVE);
             if (move) {
                 var sr = move.getData('sr');
-                move.replace(this.resourcedraghandle.cloneNode(true).setAttribute('data-sectionreturn', sr));
+                move.replace(this.get_drag_handle(M.util.get_string('movecoursemodule', 'moodle'),
+                             CSS.EDITINGMOVE, CSS.ICONCLASS, true).setAttribute('data-sectionreturn', sr));
             }
         }, this);
     },