From ca34076fbd5d24f2a77954bd07f77d227daf45bd Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Mon, 20 Jun 2011 12:05:57 +0200 Subject: [IMP] rollback namespace-alteration to dhtmlXChart, fix dhtmlxscheduler and dhtmlxgantt to not fuck up the root dhtmlx namespace (which is what breaks chart) bzr revid: xmo@openerp.com-20110620100557-zya9u6a3zuhhs0c3 --- .../codebase/dhtmlxscheduler_debug.js | 71 ++++++---------------- 1 file changed, 20 insertions(+), 51 deletions(-) (limited to 'addons/base_calendar/static/lib/dhtmlxScheduler/codebase/dhtmlxscheduler_debug.js') diff --git a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/dhtmlxscheduler_debug.js b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/dhtmlxscheduler_debug.js index 7270bd4e27f..a3c14bee033 100644 --- a/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/dhtmlxscheduler_debug.js +++ b/addons/base_calendar/static/lib/dhtmlxScheduler/codebase/dhtmlxscheduler_debug.js @@ -1,42 +1,11 @@ -/* -dhtmlxScheduler v.2.3 - -This software is allowed to use under GPL or you need to obtain Commercial or Enterise License -to use it in not GPL project. Please contact sales@dhtmlx.com for details - -(c) DHTMLX Ltd. -*/ - -dhtmlx=function(obj){ - for (var a in obj) dhtmlx[a]=obj[a]; - return dhtmlx; //simple singleton -}; -dhtmlx.extend_api=function(name,map,ext){ - var t = window[name]; - if (!t) return; //component not defined - window[name]=function(obj){ - if (obj && typeof obj == "object" && !obj.tagName && !(obj instanceof Array)){ - var that = t.apply(this,(map._init?map._init(obj):arguments)); - //global settings - for (var a in dhtmlx) - if (map[a]) this[map[a]](dhtmlx[a]); - //local settings - for (var a in obj){ - if (map[a]) this[map[a]](obj[a]); - else if (a.indexOf("on")==0){ - this.attachEvent(a,obj[a]); - } - } - } else - var that = t.apply(this,arguments); - if (map._patch) map._patch(this); - return that||this; - }; - window[name].prototype=t.prototype; - if (ext) - dhtmlXHeir(window[name].prototype,ext); -}; +/* +dhtmlxScheduler v.2.3 + +This software is allowed to use under GPL or you need to obtain Commercial or Enterise License +to use it in not GPL project. Please contact sales@dhtmlx.com for details +(c) DHTMLX Ltd. +*/ dhtmlxAjax={ get:function(url,callback){ var t=new dtmlXMLLoaderObject(true); @@ -908,7 +877,7 @@ dhtmlxEventable=function(obj){ } } } - + /** * @desc: constructor, data processor object * @param: serverProcessorURL - url used for update @@ -1489,7 +1458,7 @@ dataProcessor.prototype={ }; -//(c)dhtmlx ltd. www.dhtmlx.com +//(c)dhtmlx ltd. www.dhtmlx.com dataProcessor.prototype._o_init = dataProcessor.prototype.init; dataProcessor.prototype.init=function(obj){ this._console=this._console||this._createConsole(); @@ -1654,7 +1623,7 @@ dataProcessor.wrap("afterUpdateCallback",function(sid,tid,action){ - + /* dhx_sort[index]=direction dhx_filter[index]=mask @@ -1792,7 +1761,7 @@ if (window.dataProcessor){ dhtmlxError.catchError("LoadXML",function(a,b,c){ alert(c[0].responseText); }); - + window.dhtmlXScheduler=window.scheduler={version:2.2}; dhtmlxEventable(scheduler); scheduler.init=function(id,date,mode){ @@ -2434,7 +2403,7 @@ scheduler.getLabel = function(property, key) { } } return ""; -}; +}; scheduler.date={ date_part:function(date){ date.setHours(0); @@ -2568,7 +2537,7 @@ scheduler.date={ return this.getISOWeek(ndate); } } - + scheduler.locale={ date:{ month_full:["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"], @@ -2609,7 +2578,7 @@ scheduler.locale={ } } - + /* %e Day of the month without leading zeros (01..31) %d Day of the month, 2 digits with leading zeros (01..31) @@ -2715,7 +2684,7 @@ scheduler.init_templates=function(){ } - + scheduler.uid=function(){ if (!this._seed) this._seed=(new Date).valueOf(); return this._seed++; @@ -3260,7 +3229,7 @@ scheduler.getEvents = function(from,to){ result.push(ev); } return result; -}; +}; scheduler._loaded={}; scheduler._load=function(url,from){ url=url||this._load_url; @@ -3445,7 +3414,7 @@ scheduler.attachEvent("onXLE",function(){ this.config.show_loading=true; } }); - + scheduler.ical={ parse:function(str){ var data = str.match(RegExp(this.c_start+"[^\f]*"+this.c_end,"")); @@ -3510,7 +3479,7 @@ scheduler.ical={ e_start:"BEGIN:VEVENT", e_end:"END:VEVENT", c_end:"END:VCALENDAR" -}; +}; scheduler.form_blocks={ textarea:{ render:function(sns){ @@ -3850,7 +3819,7 @@ scheduler._get_lightbox=function(){ } return this._lightbox; } -scheduler._lightbox_template="
 
 
 
 
"; +scheduler._lightbox_template="
 
 
 
 
"; scheduler._dp_init=function(dp){ dp._methods=["setEventTextStyle","","changeEventId","deleteEvent"]; @@ -3928,4 +3897,4 @@ scheduler._update_callback = function(upd,id){ data.end_date = scheduler.templates.xml_date(data.end_date); scheduler.addEvent(data); -}; \ No newline at end of file +}; -- cgit v1.2.3