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

Issue 2356 : Fixes for the new module selector made in Luminous branch is merged

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.2@11196 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
nagoon97 2012-09-10 08:55:43 +00:00
parent 2cea153d4b
commit 2c01573625
7 changed files with 139 additions and 976 deletions
Download patch file Download diff file Expand all files Collapse all files

37
modules/admin/tpl/js/admin.js
View file

@ -568,7 +568,7 @@ _xeModuleSearch = function(){
var $siteList = $siteListDiv.find('UL');
var $moduleTypeList = $moduleTypeListDiv.find('UL');
var $moduleInstanceList = $moduleInstanceListDiv.find('UL');
var $moduleInstanceList = $moduleInstanceListDiv.find('SELECT');
var $siteListSearchInput = $moduleSearchWindow.find('INPUT.siteListSearchInput');
var aSiteListData;
@ -707,12 +707,9 @@ _xeModuleSearch = function(){
for(var x in list) {
if(!list.hasOwnProperty(x)) continue;
$li = $('<li />').appendTo($moduleInstanceList);
$('<a>').attr('href', '#').html(
'<div>'+list[x].browser_title+'</div>'
).data('module_srl', list[x].module_srl).appendTo($li);
$li = $('<option />').html(list[x].browser_title).appendTo($moduleInstanceList).val(list[x].module_srl).data('mid', list[x].module_srl)
.data('module_srl', list[x].module_srl).data('layout_srl', list[x].layout_srl).data('browser_title', list[x].browser_title);
}
$moduleInstanceListDiv.show();
@ -724,16 +721,20 @@ _xeModuleSearch = function(){
oEvent.preventDefault();
})
.end()
.find('.moduleInstanceListUL')
.delegate('a','click',function(oEvent){
$this = $(this);
.find('.moduleSearch_ok').click(function(oEvent){
var aSelected = [];
$t.find('.moduleInstanceListSelect option:selected').each(function(){
aSelected.push({
'type' : t.sSelectedModuleType,
'module_srl' : $(this).data('module_srl'),
'layout_srl' : $(this).data('layout_srl'),
'browser_title' : $(this).data('browser_title')
});
});
t.sSelectedModuleInstanceName = $this.text();
t.sSelectedModuleSrl = $this.data('module_srl');
$t.trigger('moduleSelect', [t.sSelectedModuleType, t.sSelectedModuleInstanceName, t.sSelectedModuleSrl]);
$t.trigger('moduleSelect', [aSelected]);
$('.tgAnchor.moduleSearch').trigger('close.tc');
oEvent.preventDefault();
});
@ -941,10 +942,10 @@ $('.multiLangEdit')
function on_complete(data, idx){
var results = data.results, $btn, i, c;
if(data.error || !results || (r_idx != idx+1)) return;
$this.removeClass('loading');
if(data.error || !results || results.length === 0 || (r_idx != idx+1)) return;
$ul.empty();
for(i=0,c=results.length; i < c; i++) {
$btn = $('<button type="button" class="_btnLang" />').data('langkey', results[i].name).text(results[i].value);
@ -971,6 +972,8 @@ $('.multiLangEdit')
$active = $ul.find('button.active');
if(key == ENTER) {
if($active.length === 0) return true;
$active.click();
return false;
}