fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-02 00:32:15 +09:00
Code Issues Projects Releases Packages Wiki Activity

merge from 1.5.3.2 (~r11225)

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@11226 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-09-13 06:14:45 +00:00
parent 54e3a72065
commit 77f5aa2671
313 changed files with 8058 additions and 14251 deletions
Download patch file Download diff file Expand all files Collapse all files

30
modules/widget/tpl/js/mid.js
View file

@ -13,7 +13,7 @@ xe.MidManager = xe.createApp("MidManager", {
return false;
});
$keyObj.siblings('button.delete').bind('click', function(){
$keyObj.parent().find('button.delete,a.delete').bind('click', function(){
$keyObj.val('').next().val('');
return false;
});
@ -24,6 +24,13 @@ xe.MidManager = xe.createApp("MidManager", {
$finder.slideUp(100);
return false;
});
jQuery(function($){
$('.moduleSearch').bind('moduleSelect', function(e, aSelected){
self.cast('MID_SYNC_NEW', aSelected);
});
});
},
API_MID_SYNC: function(){
@ -43,6 +50,27 @@ xe.MidManager = xe.createApp("MidManager", {
self.$keyObj.next().val(data.module_list[0].browser_title+' ('+data.module_list[0].mid+', '+data.module_list[0].module_name+')');
}
$.exec_json('module.getModuleAdminModuleList', {'module_srls': module_srl}, on_complete);
},
API_MID_SYNC_NEW: function(htBase, aParam){
var self = this;
htSelected = aParam[0];
var module_srl = htSelected.module_srl;
if (!module_srl) return;
function on_complete(data){
if (data.error){
alert(data.message);
return;
}
self.$keyObj.val(data.module_list[0].module_srl);
self.$keyObj.next().val(data.module_list[0].browser_title+' ('+data.module_list[0].mid+', '+data.module_list[0].module_name+')');
}
$.exec_json('module.getModuleAdminModuleList', {'module_srls': module_srl}, on_complete);
}
});

25
modules/widget/tpl/js/module_list.js
View file

@ -13,7 +13,7 @@ xe.ModuleListManager = xe.createApp("ModuleListManager", {
this.$moduleSrlObj = $keyObj.parent().find('.moduleIdList');
this.$selectedObj = $keyObj.parent().find('.modulelist_selected');
this.$moduleSrlObj
this.$selectedObj
.nextAll('button')
.filter('.modulelist_add').bind('click', function(){ self.cast('MODULELIST_ADD'); return false; }).hide().end()
.filter('.modulelist_del').bind('click', function(){ self.cast('MODULELIST_DEL'); return false; }).end()
@ -27,18 +27,25 @@ xe.ModuleListManager = xe.createApp("ModuleListManager", {
this.cast('MODULELIST_SYNC');
},
API_MODULELIST_ADD: function(){
var moduleTitle = this.$moduleNameObj.find('>option:selected').text();
this.$moduleSrlObj
.find('>option:selected').clone(true)
.text(function(){ return $(this).text() + ' ('+moduleTitle+')'; })
.appendTo(this.$selectedObj);
addModule: function(sModuleType, sModuleInstanceName, sModuleSrl){
$('<OPTION>').val(sModuleSrl).text(sModuleInstanceName + ' ('+sModuleType+')').appendTo(this.$selectedObj);
this.removeDuplicated();
this.refreshValue();
},
API_ADD_MODULE_TO_MODULELIST_MANAGER : function(sender, aParams){
this.addModule(aParams[0], aParams[1], aParams[2]);
},
API_MODULELIST_ADD: function(){
var sModuleType = this.$moduleNameObj.find('>option:selected').text();
var sModuleInstanceName = this.$moduleSrlObj.find('>option:selected').text();
var sModuleSrl = this.$moduleSrlObj.find('>option:selected').val();
this.addModule(sModuleType, sModuleInstanceName, sModuleSrl);
},
API_MODULELIST_DEL: function(){
this.$selectedObj.find('>option:selected').remove();
this.refreshValue();
@ -93,4 +100,4 @@ xe.ModuleListManager = xe.createApp("ModuleListManager", {
}
});
})(jQuery);
})(jQuery);

13
modules/widget/tpl/js/widget.js
View file

@ -361,11 +361,11 @@ function doAddWidgetCode(widget_code) {
// css 추가
var tmp = widget_code;
while(tmp.indexOf("<!--Meta:")>-1) {
var pos = tmp.indexOf("<!--Meta:");
while(tmp.indexOf("<!--#Meta:")>-1) {
var pos = tmp.indexOf("<!--#Meta:");
tmp = tmp.substr(pos);
var eos = tmp.indexOf("-->");
var cssfile = tmp.substr(9,eos-9);
var cssfile = tmp.substr(10,eos-10);
if(cssfile.indexOf('.js')>-1) {
tmp = tmp.substr(eos);
continue;
@ -373,7 +373,7 @@ function doAddWidgetCode(widget_code) {
if(!cssfile) break;
tmp = tmp.substr(eos);
var cssfile = request_uri+'/'+cssfile;
var cssfile = request_uri+cssfile;
if(typeof(document.createStyleSheet)=='undefined') {
var css ='<link rel="stylesheet" href="'+cssfile+'" type="text/css" charset="UTF-8" />';
var dummy = xCreateElement("DIV");
@ -400,7 +400,10 @@ function doAddWidgetCode(widget_code) {
script = script.replace(/^<script([^>]*)>/i,'').replace(/<\/script>$/i,'');
writedText = null;
eval(script);
try{
eval(script);
}catch(e){}
widget_code = widget_code.substr(0,pos)+writedText+widget_code.substr(pos+length);
tmp = widget_code.toLowerCase();
}