From 9759ee12cb152e57888aca247013bdc58785860d Mon Sep 17 00:00:00 2001 From: Paulo Veiga Date: Tue, 26 Jul 2011 16:58:49 -0300 Subject: [PATCH] Minor fixes. --- mindplot/src/main/javascript/TextEditor.js | 2 +- wise-doc/src/main/webapp/js/editor.js | 11 --- .../webapp/js/mootools-more-1.3.2.1-yui.js | 20 +++-- wise-webapp/src/main/webapp/js/windoo.js | 81 +++++++++++-------- 4 files changed, 60 insertions(+), 54 deletions(-) diff --git a/mindplot/src/main/javascript/TextEditor.js b/mindplot/src/main/javascript/TextEditor.js index 33628fd3..1b177aec 100644 --- a/mindplot/src/main/javascript/TextEditor.js +++ b/mindplot/src/main/javascript/TextEditor.js @@ -101,7 +101,7 @@ mindplot.TextEditor = new Class({ setTimeout("$('ffoxWorkarroundInput').focus();", 0); }; - this.fx = new Fx.Morph(this.inputText, 'opacity', { duration: 10}); + this.fx = new Fx.Tween(this.inputText, {property: 'opacity', duration: 10}); this.fx.addEvent('onComplete', onComplete.bind(this)); }, lostFocusEvent : function () diff --git a/wise-doc/src/main/webapp/js/editor.js b/wise-doc/src/main/webapp/js/editor.js index 9e2ad9c2..15904ebe 100644 --- a/wise-doc/src/main/webapp/js/editor.js +++ b/wise-doc/src/main/webapp/js/editor.js @@ -320,17 +320,6 @@ function afterMindpotLibraryLoading() { window.document.location = "mymaps.htm"; }); - - var autosave = function() { - - if (designer.needsSave()) { - designer.save(function() { - var monitor = core.Monitor.getInstance(); - }, false); - } - }; - autosave.periodical(30000); - // To prevent the user from leaving the page with changes ... window.onbeforeunload = function confirmExit() { if (designer.needsSave()) { diff --git a/wise-doc/src/main/webapp/js/mootools-more-1.3.2.1-yui.js b/wise-doc/src/main/webapp/js/mootools-more-1.3.2.1-yui.js index 9a233c22..6b6cde8b 100644 --- a/wise-doc/src/main/webapp/js/mootools-more-1.3.2.1-yui.js +++ b/wise-doc/src/main/webapp/js/mootools-more-1.3.2.1-yui.js @@ -1,6 +1,6 @@ // MooTools: the javascript framework. -// Load this file's selection again by visiting: http://mootools.net/more/55656dfd0c63feba6230bd0acc822f94 -// Or build this file again with packager using: packager build More/More More/URI More/URI.Relative More/Hash More/Hash.Extras More/Fx.Elements More/Fx.Accordion More/Fx.Move More/Fx.Reveal More/Fx.Scroll More/Fx.Slide More/Fx.SmoothScroll More/Fx.Sort More/Drag More/Drag.Move More/Color +// Load this file's selection again by visiting: http://mootools.net/more/a6e9cfc60901e7c04a3ebf1805354b50 +// Or build this file again with packager using: packager build More/More More/String.Extras More/URI More/URI.Relative More/Hash More/Hash.Extras More/Fx.Elements More/Fx.Accordion More/Fx.Move More/Fx.Reveal More/Fx.Scroll More/Fx.Slide More/Fx.SmoothScroll More/Fx.Sort More/Drag More/Drag.Move More/Color /* --- copyrights: @@ -10,11 +10,17 @@ licenses: - [MIT License](http://mootools.net/license.txt) ... */ -MooTools.More={version:"1.3.2.1",build:"e586bcd2496e9b22acfde32e12f84d49ce09e59d"};String.implement({parseQueryString:function(d,a){if(d==null){d=true; -}if(a==null){a=true;}var c=this.split(/[&;]/),b={};if(!c.length){return b;}c.each(function(i){var e=i.indexOf("=")+1,g=e?i.substr(e):"",f=e?i.substr(0,e-1).match(/([^\]\[]+|(\B)(?=\]))/g):[i],h=b; -if(!f){return;}if(a){g=decodeURIComponent(g);}f.each(function(k,j){if(d){k=decodeURIComponent(k);}var l=h[k];if(j]*>([\\s\\S]*?)":"]+)?>",f=new RegExp(h,"gi"); +return f;};String.implement({standardize:function(){return a(this,c);},repeat:function(e){return new Array(e+1).join(this);},pad:function(e,h,g){if(this.length>=e){return this; +}var f=(h==null?" ":""+h).repeat(e-this.length).substr(0,e-this.length);if(!g||g=="right"){return this+f;}if(g=="left"){return f+this;}return f.substr(0,(f.length/2).floor())+this+f.substr(0,(f.length/2).ceil()); +},getTags:function(e,f){return this.match(d(e,f))||[];},stripTags:function(e,f){return this.replace(d(e,f),"");},tidy:function(){return a(this,b);},truncate:function(e,f,i){var h=this; +if(f==null&&arguments.length==1){f="…";}if(h.length>e){h=h.substring(0,e);if(i){var g=h.lastIndexOf(i);if(g!=-1){h=h.substr(0,g);}}if(f){h+=f;}}return h; +}});})();String.implement({parseQueryString:function(d,a){if(d==null){d=true;}if(a==null){a=true;}var c=this.split(/[&;]/),b={};if(!c.length){return b; +}c.each(function(i){var e=i.indexOf("=")+1,g=e?i.substr(e):"",f=e?i.substr(0,e-1).match(/([^\]\[]+|(\B)(?=\]))/g):[i],h=b;if(!f){return;}if(a){g=decodeURIComponent(g); +}f.each(function(k,j){if(d){k=decodeURIComponent(k);}var l=h[k];if(j
'; }; - var iefix = window.ie && this.options.type != 'iframe', - innerContent = '
' + $row("top", "title") + $row("bot", "strut") + '
' + (iefix ? Windoo.ieTableCell : '') + '
'; - this.el.setHTML(innerContent).inject(this.options.container); + var iefix = window.ie && this.options.type != 'iframe'; + this.el.innerHTML = '
' + $row("top", "title") + $row("bot", "strut") + '
' + (iefix ? Windoo.ieTableCell : '') + '
'; + this.el.inject(this.options.container); + + if (window.ie) this.el.addClass(_p + '-' + theme.name + '-ie'); var frame = this.el.getFirst(), body = this.el.getLast(), title = frame.getElement('.title'), titleText = new Element('div', {'class': 'title-text'}).inject(title); + + frame.getElement('.strut').innerHTML = ' ', this.dom = { frame: frame, body: body, title: titleText, - strut: frame.getElement('.strut').setHTML(' '), + strut: frame.getElement('.strut'), content: iefix ? body.getElement('td') : body }; this.dom.title.addEvent('dblclick', this.maximize.bind(this)); @@ -1008,7 +1016,8 @@ var Windoo = new Class({ self.bound[name] = action; if (opt) { var klass = _p + '-button ' + _p + '-' + name + ( opt == 'disabled' ? ' ' + _p + '-' + name + '-disabled' : '' ); - self.dom[name] = new Element('a', {'class': klass, 'href': '#', 'title': title}).setHTML('x').inject(self.el); + self.dom[name] = new Element('a', {'class': klass, 'href': '#', 'title': title}).innerHTML = 'x'; + self.dom[name].inject(self.el); self.dom[name].addEvent('click', opt == 'disabled' ? self.bound.noaction : action); } }; @@ -1047,7 +1056,7 @@ var Windoo = new Class({ }, setHTML: function(content) { - if (!this.dom.iframe) this.dom.content.empty().setHTML(content); + if (!this.dom.iframe) this.dom.content.empty().innerHTML = content; return this; }, @@ -1084,7 +1093,7 @@ var Windoo = new Class({ }, setTitle: function(title) { - this.dom.title.setHTML(title || ' '); + this.dom.title.innerHTML = title || ' '; return this; }, @@ -1121,7 +1130,7 @@ var Windoo = new Class({ }, fix: function(hide) { - this.el.fixOverlay(hide || !this.visible); + this.el.$overlay(hide || !this.visible); return this.fixShadow(hide); }, @@ -1310,7 +1319,8 @@ var Windoo = new Class({ return this.setZIndex(this.wm.maxZIndex()); } }); -Windoo.implement(new Events, new Options); +//Windoo.implement(new Events, new Options); + Windoo.ieTableCell = '
'; Windoo.Themes = { @@ -1558,7 +1568,7 @@ Windoo.Themes.aqua = { Windoo.Ajax = Ajax.extend({ onComplete: function() { - if (this.options.window) this.options.window.setHTML(this.response.text); + if (this.options.window) this.options.window.innerHTML = this.response.text; this.parent(); } }); @@ -1695,7 +1705,8 @@ Windoo.Dialog = Windoo.extend({ dialog.dom.panel = new Element('div', $merge({'class': this.classPrefix(klass + '-pane')}, dialog.options.panel)); for (var btn in buttons) if (buttons[btn]) dialog.dom.panel.adopt(dialog.buttons[btn]); dialog.dom.message = new Element('div', $merge({'class': this.classPrefix(klass + '-message')}, dialog.options.message)); - return this.addPanel(dialog.dom.panel).adopt(dialog.dom.message.setHTML(dialog.message)); + dialog.dom.message.innerHTML = dialog.message; + return this.addPanel(dialog.dom.panel).adopt(dialog.dom.message); } });