fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-21 20:29:57 +09:00
Code Issues Projects Releases Packages Wiki Activity

merge from 1.7.3.5(r13153:r13167)

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@13168 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2013-09-29 23:32:39 +00:00
parent cc47d2b247
commit 2d3f149b5a
2042 changed files with 129266 additions and 126243 deletions
Download patch file Download diff file Expand all files Collapse all files

17
modules/admin/tpl/js/menu_setup.js
View file

@ -51,7 +51,7 @@ jQuery(function($){
// menu - drag and drop
jQuery(function($){
$('form.siteMap')
$('form.adminMap')
.delegate('li:not(.placeholder)', 'dropped.st', function() {
var $this = $(this), $pkey, $mkey, is_child;
@ -69,7 +69,7 @@ var
dragging = false,
$holder = $('<li class="placeholder">');
$('div.adminMenu')
$('form.adminMap>ul')
.delegate('li:not(.placeholder,.parent)', {
'mousedown.st' : function(event) {
var $this, $uls, $ul, width, height, offset, position, offsets, i, dropzone, wrapper='';
@ -81,11 +81,9 @@ $('div.adminMenu')
$this = $(this);
height = $this.height();
width = $this.width();
$uls = $this.parentsUntil('.siteMap').filter('ul');
$uls = $this.parentsUntil('.adminMap').filter('ul');
$ul = $uls.eq(-1);
$ul.css('position', 'relative');
position = {x:event.pageX, y:event.pageY};
offset = getOffset(this, $ul.get(0));
@ -207,12 +205,9 @@ $('div.adminMenu')
return false;
}
})
.find('li')
.prepend('<button type="button" class="moveTo">Move to</button>')
.filter('.parent')
.find('>button.moveTo').css({'visibility':'hidden','margin-left':'-12px'}).end()
.end()
.end()
.find('li li')
.prepend('<button type="button" class="moveTo">Move to</button>').end()
.end();
$('<div id="dropzone-marker" />')
.css({display:'none',position:'absolute',backgroundColor:'#000',opacity:0.7})