spaces->tabs

[Plinn.git] / skins / ajax_scripts / ajax_form_manager.js

diff --git a/skins/ajax_scripts/ajax_form_manager.js b/skins/ajax_scripts/ajax_form_manager.js
index 03ebdd8..8b51b2e 100644 (file)
--- a/skins/ajax_scripts/ajax_form_manager.js
+++ b/skins/ajax_scripts/ajax_form_manager.js
@@ -17,7 +17,6 @@ FormManager = function(form, responseTextDest, lazy) {
        var thisManager = this;
        this.form.onsubmit = function(evt) { thisManager.submit(evt); };
        this.form.onclick = function(evt) { thisManager.click(evt); };
-       this.submitButton = null;
        
        /* raised on form submit */
        this.onBeforeSubmit = null;
@@ -55,6 +54,7 @@ FormManager.prototype.submit = function(evt) {
                        if (onBeforeSubmit.length) {
                                onBeforeSubmit = onBeforeSubmit[0];
                        }
+                       /*jslint evil: true */
                        this.onBeforeSubmit = eval(onBeforeSubmit.value);
                        bsMessage = this.onBeforeSubmit(thisManager, evt);
                }
@@ -99,7 +99,7 @@ FormManager.prototype.submit = function(evt) {
                query += submitButton.name + '=' + submitButton.value + '&';
        }
        
-       if (window.AJAX_CONFIG && (AJAX_CONFIG & 1 === 1)) {
+       if (window.AJAX_CONFIG && ((AJAX_CONFIG & 1) === 1)) {
                if (form.method.toLowerCase() === 'post') {
                        this._post(query);
                }
@@ -175,10 +175,10 @@ FormManager.prototype.replaceElementByField = function(evt) {
                var tabIndex = ob.tabIndex;
                var text;
                if (ob.firstChild && ob.firstChild.className === 'hidden_value') {
-                   text = ob.firstChild.innerHTML;
+                       text = ob.firstChild.innerHTML;
                }
                else {
-                   text = ob.innerHTML;
+                       text = ob.innerHTML;
                }
                disablePropagation(evt);
                var parent;
@@ -422,21 +422,18 @@ FormManager.prototype.loadResponse = function(req) {
        }
        
        var onAfterPopulate = this.onAfterPopulate;
-       if (typeof(onAfterPopulate) === "string") {
-               if (window.console) {
-                       console.warn('Deprecation WARNING onAfterPopulate: ' + onAfterPopulate);
-               }
-               onAfterPopulate = eval(onAfterPopulate);
-       }
        onAfterPopulate();
        this.scrollToPortalMessage();
+       history.pushState(absolute_url(), document.title, absolute_url());
 };
 
 FormManager.prototype.scrollToPortalMessage = function() {
        var psm = document.getElementById('DesktopStatusBar');
-       var msgOffset = psm.offsetTop;
-       smoothScroll(window.scrollY, msgOffset);
-       shake(psm, 10, 1000);
+       if (psm) {
+               var msgOffset = psm.offsetTop;
+               smoothScroll(window.scrollY, msgOffset);
+               shake(psm, 10, 1000);
+       }
 };
 
 FormManager.prototype._fitField = function(evt) {
@@ -484,43 +481,43 @@ function smoothScroll(from, to) {
 
 /* adapted from http://xahlee.info/js/js_shake_box.html */
 function shake(e, distance, time) {
-    // Handle arguments
-    if (!time) time = 500;
-    if (!distance) distance = 5;
-
-    // Save the original style of e, Make e relatively positioned, Note the animation start time, Start the animation
-    var originalStyle = e.style.cssText;
-    e.style.position = "relative";
-    var start = (new Date()).getTime();
-    animate();
-
-    // This function checks the elapsed time and updates the position of e.
-    // If the animation is complete, it restores e to its original state.
-    // Otherwise, it updates e's position and schedules itself to run again.
-    function animate() {
-        var now = (new Date()).getTime();
-        // Get current time
-        var elapsed = now-start;
-        // How long since we started
-        var fraction = elapsed/time;
-        // What fraction of total time?
-        if (fraction < 1) {
-            // If the animation is not yet complete
-            // Compute the x position of e as a function of animation
-            // completion fraction. We use a sinusoidal function, and multiply
-            // the completion fraction by 4pi, so that it shakes back and
-            // forth twice.
-            var x = distance * Math.sin(fraction*8*Math.PI);
-            e.style.left = x + "px";
-            // Try to run again in 25ms or at the end of the total time.
-            // We're aiming for a smooth 40 frames/second animation.
-            setTimeout(animate, Math.min(25, time-elapsed));
-        }
-        else {
-            // Otherwise, the animation is complete
-            e.style.cssText = originalStyle; // Restore the original style
-        }
-    }
+       // Handle arguments
+       if (!time) { time = 500; }
+       if (!distance) { distance = 5; }
+
+       // Save the original style of e, Make e relatively positioned, Note the animation start time, Start the animation
+       var originalStyle = e.style.cssText;
+       e.style.position = "relative";
+       var start = (new Date()).getTime();
+
+       // This function checks the elapsed time and updates the position of e.
+       // If the animation is complete, it restores e to its original state.
+       // Otherwise, it updates e's position and schedules itself to run again.
+       function animate() {
+               var now = (new Date()).getTime();
+               // Get current time
+               var elapsed = now-start;
+               // How long since we started
+               var fraction = elapsed/time;
+               // What fraction of total time?
+               if (fraction < 1) {
+                       // If the animation is not yet complete
+                       // Compute the x position of e as a function of animation
+                       // completion fraction. We use a sinusoidal function, and multiply
+                       // the completion fraction by 4pi, so that it shakes back and
+                       // forth twice.
+                       var x = distance * Math.sin(fraction*8*Math.PI);
+                       e.style.left = x + "px";
+                       // Try to run again in 25ms or at the end of the total time.
+                       // We're aiming for a smooth 40 frames/second animation.
+                       setTimeout(animate, Math.min(25, time-elapsed));
+               }
+               else {
+                       // Otherwise, the animation is complete
+                       e.style.cssText = originalStyle; // Restore the original style
+               }
+       }
+       animate();
 }
 
 }());