Remove autoscroll from follow page stuff

rundeck · Feb 18, 2011 · 9fbe340 · 9fbe340
1 parent 4013f6c
commit 9fbe340
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 94 deletions.
diff --git a/rundeckapp/grails-app/views/execution/show.gsp b/rundeckapp/grails-app/views/execution/show.gsp
@@ -256,36 +256,6 @@
                             id="appendBottomLabel"
                             onclick="followControl.setOutputAppendTop(false);"
                         >Bottom</span></label>
-                    <span
-                    class="action textbtn button"
-                    title="Click to change"
-                    id="autoscrollTrueLabel"
-                >
-                <input
-                    type="checkbox"
-                    name="outputautoscroll"
-                    id="outputautoscrolltrue"
-                    value="true"
-                    ${followmode=='tail'?'':'checked="CHECKED"'}
-                    onclick="followControl.setOutputAutoscroll($('outputautoscrolltrue').checked);"
-                    style=""/>
-
-                <label for="outputautoscrolltrue">Scroll</label></span>
-
-                <%--
-                <input
-                    type="radio"
-                    name="outputautoscroll"
-                    id="outputautoscrollfalse"
-                    value="false"
-                    style="display:none;"/>
-                <label for="outputautoscrollfalse"><span
-                    class="action textbtn button"
-                    title="Click to change"
-                    id="autoscrollFalseLabel"
-                    onclick="setOutputAutoscroll(false);"
-                >no</span></label>
-                --%>
 <%--
             </td>
             <td>--%>

diff --git a/rundeckapp/grails-app/views/execution/showFragment.gsp b/rundeckapp/grails-app/views/execution/showFragment.gsp
@@ -98,37 +98,7 @@
                         checked="CHECKED"
                         style="display: none;"/>
                     Bottom</label>
-                <label
-                    class="action textbtn button"
-                    title="Click to change"
-                    id="autoscrollTrueLabel"
-                >
-                <input
-                    type="checkbox"
-                    name="outputautoscroll"
-                    class=" opt_auto_scroll_true"
-                    id="outputautoscrolltrue"
-                    value="true"
-                    ${followmode=='tail'?'':'checked="CHECKED"'}
-                    onclick="setOutputAutoscroll(this.checked);"
-                    style=""/>
-
-                Scroll</label>
 
-                <%--
-                <input
-                    type="radio"
-                    name="outputautoscroll"
-                    id="outputautoscrollfalse"
-                    value="false"
-                    style="display:none;"/>
-                <label for="outputautoscrollfalse"><span
-                    class="action textbtn button"
-                    title="Click to change"
-                    id="autoscrollFalseLabel"
-                    onclick="setOutputAutoscroll(false);"
-                >no</span></label>
-                --%>
 <%--
             </td>
             <td>--%>

diff --git a/rundeckapp/web-app/js/executionControl.js b/rundeckapp/web-app/js/executionControl.js
@@ -26,7 +26,6 @@ var FollowControl = Class.create({
     collapseCtx: {value:true,changed:false},
     showFinalLine: {value:true,changed:false},
     groupOutput: {value: true},
-    autoscroll: true,
 
     lastrow:null,
     contextIdCounter: 0,
@@ -194,14 +193,6 @@ var FollowControl = Class.create({
                         e.removeClassName('selected');
                     }
                 });
-                $(this.targetElement).select('.opt_auto_scroll_true').each(function(e){
-                    e.checked=obj.autoscroll;
-                    if(obj.autoscroll){
-                        e.up('label').addClassName('selected');
-                    }else{
-                        e.up('label').removeClassName('selected');
-                    }
-                });
                 $(this.targetElement).select('.opt_group_output').each(function(e){
                     e.checked=obj.groupOutput.value;
                     if(obj.groupOutput.value){
@@ -397,23 +388,6 @@ var FollowControl = Class.create({
             }
         }
     },
-    setOutputAutoscroll: function(val) {
-        this.autoscroll = val;
-        if ($('autoscrollTrueLabel')) {
-            if (val) {
-                $('autoscrollTrueLabel').addClassName('selected');
-            } else {
-                $('autoscrollTrueLabel').removeClassName('selected');
-            }
-        }
-        if ($('autoscrollFalseLabel')) {
-            if (val) {
-                $('autoscrollFalseLabel').removeClassName('selected');
-            } else {
-                $('autoscrollFalseLabel').addClassName('selected');
-            }
-        }
-    },
     setOutputAppendTop: function(istop) {
         if (this.appendtop.value != istop) {
             this.appendtop.changed = !this.appendtop.changed;
@@ -544,14 +518,6 @@ var FollowControl = Class.create({
             }
         }
 
-        if (needsScroll && this.autoscroll && $('commandPerform')) {
-            if (document.body.scrollHeight) {
-                window.scrollTo(0, document.body.scrollHeight);
-            }
-            else if (screen.height) { // IE5
-                window.scrollTo(0, screen.height);
-            }
-        }
 
         if (this.runningcmd.completed && this.runningcmd.jobcompleted) {
             //halt timer