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

rollback r10320, r10298, r10276, r10272

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10318 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-03-05 09:16:55 +00:00
parent f8dd9888f6
commit 206ded7cf9
149 changed files with 3745 additions and 2812 deletions
Download patch file Download diff file Expand all files Collapse all files

12
modules/editor/skins/dreditor/js/DrEditor.js
View file

@ -512,7 +512,7 @@ var DrEditor = xe.createApp('DrEditor', {
var type = (params[2]||'').toUpperCase();
// save and cancel button
var _buttons = editor.find('div.btnArea button');
var _buttons = editor.find('div.buttonArea button');
_buttons.eq(0).click(function(){ self.cast('CLOSE_EDITOR', [seq, true, type]); }); // save button
_buttons.eq(1).click(function(){ self.cast('CLOSE_EDITOR', [seq, false, type]); }); // cancel button
@ -1591,7 +1591,7 @@ var MaterialWriter = xe.createPlugin('MaterialWriter', {
tpl.addClass('xe_dr_'+this.type);
tpl.find('dt').text(this.regdate.substring(0,4)+'.'+this.regdate.substring(4,6)+'.'+this.regdate.substring(6,8)+' '+this.regdate.substring(8,10)+':'+this.regdate.substring(10,12));
tpl.find('dd > div.eArea').html(this.content);
tpl.find('dd > span.btnDrEditor > button').click(function(event){
tpl.find('dd > span.buttonDrEditor > button').click(function(event){
var t = $(event.target);
var o = t.parent().prev('div.eArea').eq(0).clone();
@ -1695,7 +1695,7 @@ var FileWriter = xe.createPlugin('FileWriter', {
tpl.find('>strong').text(fileObj.name);
tpl.find('>em').text(this.formatsize(fileObj.size));
tpl.addClass('filesrl_-'+(orderedFiles.length+cfg.queue_idx));
tpl.find('button.btnDelete').click(function(){ self.ondelete(seq, $(this)) }).hide();
tpl.find('button.buttonDelete').click(function(){ self.ondelete(seq, $(this)) }).hide();
tpl.appendTo(cfg.files);
cfg.files.show().append(tpl);
@ -1731,7 +1731,7 @@ var FileWriter = xe.createPlugin('FileWriter', {
dd.removeClass(cls).addClass('filesrl_'+fileObj.file_srl);
// 삭제버튼 보여주기
dd.find('button.btnDelete').show();
dd.find('button.buttonDelete').show();
}
});
},
@ -1833,7 +1833,7 @@ var FileWriter = xe.createPlugin('FileWriter', {
tpl.addClass('filesrl_'+srl);
tpl.find('>strong').text(dd.find('>a').text());
tpl.find('>em').text(dd.find('>span').text());
tpl.find('button.btnDelete').click(function(){ self.ondelete(seq, $(this)) });
tpl.find('button.buttonDelete').click(function(){ self.ondelete(seq, $(this)) });
cfg.n_count++;
cfg.n_size += parseInt(uploadedFiles[srl].file_size) || 0
@ -2589,7 +2589,7 @@ function translate_cite(str) {
function is_left_click(event) {
var ie = $.browser.msie;
return (typeof(event.btn)=='undefined' || (ie && event.btn == 1) || (!ie && event.btn == 0));
return (typeof(event.button)=='undefined' || (ie && event.button == 1) || (!ie && event.button == 0));
}
editor.translate = translate;

4
modules/editor/skins/dreditor/js/Xpress_Editor.js
View file

@ -5871,7 +5871,7 @@ xe.XE_Table = jQuery.Class({
this._startSel = null;
this._endSel = null;
if (!sel.length || !this._isLeftClicked(event.btn)) return;
if (!sel.length || !this._isLeftClicked(event.button)) return;
function delayed(){
sel = app.getSelection().cloneRange();
@ -5906,7 +5906,7 @@ xe.XE_Table = jQuery.Class({
var self = this;
// 마우스 왼쪽 버튼이 눌리지 않았으면 종료
if (!cell.length || !this._isLeftClicked(event.btn)) return;
if (!cell.length || !this._isLeftClicked(event.button)) return;
if (!this._endSel && cell.get(0) == this._startSel.get(0)) return;
if (this._endSel && cell.get(0) == this._endSel.get(0)) return;