dinislage/web2py
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed vertical scroll issue with editor, thanks LightDot

Browse Source
This commit is contained in:
mdipierro committed 2013-06-10 21:29:46 -05:00
1 parent a2a1e95c96
commit 4a24523c10
3 files changed
+8 -11
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.5.1-stable+timestamp.2013.06.10.06.18.59 Version 2.5.1-stable+timestamp.2013.06.10.21.28.53
applications/admin/static/css/styles.css
+2 -1
View File
@@ -1304,4 +1304,5 @@ a[rel='tooltip'] span{background:#9fb364;color:#eef1d9;border:1px solid #eef1d9;
.shell .prompt,.shell #output,.shell pre,.shell #caret{font-family:monospace;} .shell .prompt,.shell #output,.shell pre,.shell #caret{font-family:monospace;}
.shell a[rel="tooltip"]{margin-left:8px;} .shell a[rel="tooltip"]{margin-left:8px;}
.shell .clearfix{clear:both;} .shell .clearfix{clear:both;}
.shell #caret{padding-top:9px;} .shell #caret{padding-top:9px;}
.small-font {font-size: 0.8em; white-space: nowrap}
applications/admin/views/default/edit.html
+5 -9
View File
@@ -109,17 +109,14 @@ jQuery(document).on('click', '#themes a', function (e) {
return window.innerHeight || (document.documentElement || document.body).clientHeight; return window.innerHeight || (document.documentElement || document.body).clientHeight;
} }
function setFullScreen(instance, full) { function setFullScreen(instance, full) {
var wrap = instance.getWrapperElement(), scroll = instance.getScrollerElement(); var wrap = instance.getWrapperElement()
if (full) { if (full) {
wrap.className += " CodeMirror-fullscreen"; wrap.className += " CodeMirror-fullscreen";
jQuery(wrap).css('width', "100%"); wrap.style.height = winHeight() + "px";
jQuery(wrap).css('position', "absolute");
scroll.style.height = winHeight() + "px";
document.documentElement.style.overflow = "hidden"; document.documentElement.style.overflow = "hidden";
} else { } else {
wrap.className = wrap.className.replace(" CodeMirror-fullscreen", ""); wrap.className = wrap.className.replace(" CodeMirror-fullscreen", "");
jQuery(wrap).css('position', "relative"); wrap.style.height = "";
scroll.style.height = "";
document.documentElement.style.overflow = ""; document.documentElement.style.overflow = "";
} }
instance.refresh(); instance.refresh();
@@ -127,8 +124,7 @@ jQuery(document).on('click', '#themes a', function (e) {
CodeMirror.on(window, "resize", function() { CodeMirror.on(window, "resize", function() {
var showing = document.body.getElementsByClassName("CodeMirror-fullscreen")[0]; var showing = document.body.getElementsByClassName("CodeMirror-fullscreen")[0];
if (!showing) return; if (!showing) return;
console.log('CodeMirror.connect()',winHeight() ); showing.CodeMirror.getWrappererElement().style.height = winHeight() + "px";
showing.CodeMirror.getScrollerElement().style.height = winHeight() + "px";
}); });
{{if len(request.args) > 1:}} {{if len(request.args) > 1:}}
@@ -168,7 +164,7 @@ jQuery(document).on('click', '#themes a', function (e) {
{{for dir in dirs:}} {{for dir in dirs:}}
<li class="nav-header component" onclick="collapse('{{="%s_files" % dir['name']}}');">{{=dir['name']}}</li> <li class="nav-header component" onclick="collapse('{{="%s_files" % dir['name']}}');">{{=dir['name']}}</li>
<li id="{{="%s_files" % dir['name']}}"> <li id="{{="%s_files" % dir['name']}}">
<ul class="nav nav-list"> <ul class="nav nav-list small-font">
{{for f in listfiles(app, dir['name'], regexp=dir['reg'] ):}} {{for f in listfiles(app, dir['name'], regexp=dir['reg'] ):}}
{{id="%s__" % dir['name'] + f.replace('.','__')}} {{id="%s__" % dir['name'] + f.replace('.','__')}}
{{current_file = request.args(len(request.args) - 1)}} {{current_file = request.args(len(request.args) - 1)}}