Changeset 40

Timestamp:

10/27/07 16:09:28 (6 years ago)

Author:

Lantash

Message:

Fixed bug in BBCode parsing routine. [Closes #21]

Some more code cleanup.

Location:

trunk/javascript

Files:

• klassenbuch.comments.js (modified) (1 diff)
• klassenbuch.controls.js (modified) (20 diffs)

trunk/javascript/klassenbuch.comments.js

@@ -513 +513 @@
         var comment = this.comment.text.replaceAll("[BR /]", "<br />");
         
-        [["B", "strong"], ["I", "em"], ["U", "u"]].each(function(a) {
-            if (comment.count("[" + a[0] + "]") === comment.count("[/" + a[0] + "]")) {
-                comment = comment.replaceAll("[" + a[0] + "]", "<" + a[1] + ">").replaceAll("[/" + a[0] + "]", "</" + a[1] + ">");
+                [["[B]", "[/B]", "<b>", "</b>"], ["[I]", "[/I]", "<i>", "</i>"], ["[U]", "[/U]", "<u>", "</u>"]].each(function(a) {
+                        var count1 = comment.count(a[0]);
+            if (count1 && count1 === comment.count(a[1])) {
+                comment = comment.replaceAll(a[0], a[2]).replaceAll(a[1], a[3]);
             }
-         });
+        });
                 
         Comments.Emoticons.each(function(pair) {

trunk/javascript/klassenbuch.controls.js

@@ -140 +140 @@
 });
 
-$w("setStyle addClassName removeClassName toggleClassName").each(function(a) {
+$w("setStyle addClassName removeClassName toggleClassName centerOnScreen").each(function(a) {
         Control.prototype[a] = function(val) {
                 this.element[a](val);
@@ -225 +225 @@
 Controls.Button = Class.create(Control, {
         initialize: function($super, caption, action, options) {
-                if (!Object.isString(caption)) {
-                        return;
-                }
-                
                 // Überschreibt die mit options übergebenen Einstellungen mit den Standardwerten
-                this.setOptions({ enabled: true,
+                this.setOptions({
+                        enabled: true,
                         onlySignedIn: false,
                         className: "",
@@ -239 +236 @@
                 }, options);
                 
-                this.action = action || Prototype.emptyFunction;
-                
-        $super(new Element(this.options.tag, { className: "unselectable " + this.options.className }));
+        $super(new Element(this.options.tag, {
+                        className: "unselectable " + this.options.className,
+                        title: this.options.title
+                }));
         
+        this.action = action || Prototype.emptyFunction;
                 this.setCaption(caption);
                 
@@ -251 +250 @@
                 this.on("click", action);
                 
-                ["Over", "Down", "Out", "Up"].each(function(a) {
-                        this.element.observe(("mouse" + a).toLowerCase(), this["_on" + a].bind(this));
+                $w("over down out up").each(function(a) {
+                        this.element.observe("mouse" + a, this._setState.bind(this, a));
                 }, this);
                 
@@ -261 +260 @@
                 
                 this._updateContent();
-                
-                this._onOut();
                 this.enable();
                 
@@ -271 +268 @@
                 if (!this.options.visible) {
                         this.hide();
-                }
-                
-                if (this.options.title) {
-                        this.element.writeAttribute("title", this.options.title);
                 }
         },
@@ -339 +332 @@
         },
         
-        _onOver: function() {
-                this._setBackground(-100);
-        },
-        
-        _onDown: function() {
-                this._setBackground(-200);
-        },
-        
-        _onOut: function() {
-                this._setBackground(0);
-        },
-        
-        _onUp: function() {
-                this._setBackground(-100);
-        },
-        
         setButtonClass: function(buttonClass) {
         if (this.buttonClass) {
@@ -364 +341 @@
         },
         
-        _setBackground: function(position) {
-                if (this.enabled) {
+        _setState: function(state) {
+                var position = {
+                        out: 0,
+                        enabled: 0,
+                        over: -100,
+                        up: -100,
+                        down: -200,
+                        disabled: -300
+                }[state];
+                
+                if (this.enabled && Object.isDefined(position)) {
                         this.leftBoundary.setStyle({ backgroundPosition: "0px " + position + "px" });
                         this.rightBoundary.setStyle({ backgroundPosition: "100% " + position + "px" });
@@ -378 +364 @@
                 if (!this.enabled) {
                         this.enabled = true;
-                        this._onOut();
+                        this._setState("enabled");
                         
                         this.removeClassName("disabled" + this.options.buttonClass.capitalize());
@@ -399 +385 @@
         disable: function() {
                 if (this.enabled) {
-            this._setBackground(-300);
+            this._setState("disabled");
             this.enabled = false;
             
@@ -417 +403 @@
 Controls.Link = Class.create(Control, {
         initialize: function($super, caption, action) {
-                $super(new Element("a", { className: "linkControl", href: "javascript:void(null);" }));
+                $super(new Element("a", {
+                        className: "linkControl",
+                        href: "javascript:void(null);"
+                }));
                 
                 this.element.innerHTML = caption;
                 this.element.observe("click", this.fireEvent.bind(this, "click"));
                 
-                this.on("click", action);
+                this.on("click", action || Prototype.K);
         }
 });
@@ -610 +599 @@
                 
                 tab.on("activate", this._onTabActivated, this);
-                
-                if (!this.activeTab) {
-                        tab.activate();
-                } else {
-                        tab.deactivate();
-                }
+                tab[(this.activeTab) ? "deactivate" : "activate"]();
                 
                 this.tabs.splice(index, 0, tab);
-                
                 this.fireEvent("addTab", tab);
                 
@@ -676 +659 @@
 Controls.TabControl.TabPage = Class.create(Control, App.History.Node.prototype, {
         initialize: function($super, caption) {
-                if (!caption) {
-                        return;
-                }
-                
                 $super(new Element("div"));
                 
@@ -711 +690 @@
 Controls.TabControl.TabPageWithButtonControl = Class.create(Controls.TabControl.TabPage, {
         initialize: function($super, caption, icon, buttonClass) {
-                if (!Object.isString(caption)) {
-                        return;
-                }
-                
                 this.icon = icon;
                 this._buttonClass = buttonClass || "menuItem";
@@ -738 +713 @@
 Controls.View = Class.create(Controls.TabControl.TabPageWithButtonControl, {
         initialize: function($super, caption, icon, title, options) {
-                if (!Object.isString(caption)) {
-                        return;
-                }
-                
                 this.setOptions({ hasAdditionalCommands: true }, options);
         $super(caption, icon);
@@ -847 +818 @@
         setHelpText: function(text) {
                 this.help.innerHTML = text;
-        },
-        
-        getHelpText: function() {
-                return this.help.innerHTML;
         }
 });
@@ -937 +904 @@
                 
                 this.element.observe("submit", this._onSubmit.bind(this));
-                
                 this.element.observe("keypress", (function(e) {
                         if (e.keyCode === Event.KEY_RETURN) {
@@ -1144 +1110 @@
                         document.observe("mouseup", this.stopDraggingListener);
                         document.observe("mousemove", this.moveListener);
+                        
+                        this._windowSize = Tools.getWindowSize();
                 }
         },
@@ -1156 +1124 @@
         },
         
-        move: function(e) {
-                if (this.draging && e) {
-                        var windowSize = Tools.getWindowSize();
-                        
-                        var clientX = e.clientX.limitTo(0, windowSize.width);
-                        var clientY = e.clientY.limitTo(0, windowSize.height);
-                        
-                        this.target.setStyle({ left: this.offsetX + clientX - this.x + "px", top: this.offsetY + clientY - this.y + "px" });
+        move: function(event) {
+                if (this.draging && event) {
+                        var clientX = event.clientX.limitTo(0, this._windowSize.width);
+                        var clientY = event.clientY.limitTo(0, this._windowSize.height);
+                        
+                        this.target.setStyle({
+                                left: this.offsetX + clientX - this.x + "px",
+                                top: this.offsetY + clientY - this.y + "px"
+                        });
                 }
         },
@@ -1253 +1222 @@
         update: function(content) {
         this.content.innerHTML = content;
-        },
-        
-        /**
-         * @method Zentriert das Steuerelement basierend auf seiner Grösse im Browserfenster (Wrapperfunktion).
-         * @return {ExtendedHTMLObject} Das HTML-Element des Steuerelement.
-        */
-        centerOnScreen: function() {
-                return this.element.centerOnScreen();
         },