Merge pull request #5 from alexyan/master

make recordDetailOverlay resizable
This commit is contained in:
想当当 2014-08-27 21:21:03 +08:00
commit f9413c1cd2
2 changed files with 97 additions and 4 deletions

View File

@ -150,6 +150,9 @@ function userRequestHandler(req,userRes){
}catch(e){} }catch(e){}
}); });
res.on('error',function(error){
console.log('error',error);
});
}); });
@ -253,12 +256,17 @@ function mergeCORSHeader(reqHeader,originHeader){
targetObj["access-control-allow-methods"] = "GET, POST, PUT"; targetObj["access-control-allow-methods"] = "GET, POST, PUT";
targetObj["access-control-allow-headers"] = reqHeader['access-control-request-headers'] || "-___-||"; targetObj["access-control-allow-headers"] = reqHeader['access-control-request-headers'] || "-___-||";
//
targetObj["Transfer-Encoding"] = "chunked";
// Disable caching // Disable caching
// If the response status is 304 not modified, the data event of response will not emmit // If the response status is 304 not modified, the data event of response will not emmit
targetObj["Transfer-Encoding"] = "chunked"
targetObj["Cache-Control"] = "no-cache, no-store, must-revalidate"; targetObj["Cache-Control"] = "no-cache, no-store, must-revalidate";
targetObj["Pragma"] = "no-cache"; targetObj["Pragma"] = "no-cache";
targetObj["Expires"] = 0; targetObj["Expires"] = 0;
//
targetObj["server"] = "anyproxy server";
targetObj["x-powered-by"] = "Alipay-ct-wd";
return targetObj; return targetObj;
} }

View File

@ -26,8 +26,11 @@
</div> </div>
<div class="recordDetailOverlay J_recordDetailOverlay" style="display:none"> <div class="recordDetailOverlay J_recordDetailOverlay" style="display:none">
<div id="dragbar"></div>
<span class="escBtn J_escBtn">Close (ESC)</span> <span class="escBtn J_escBtn">Close (ESC)</span>
<div class="J_recordDetailOverlayContent"></div> <div class="J_recordDetailOverlayContentWrapper">
<div class="J_recordDetailOverlayContent"></div>
</div>
</div> </div>
<script type="text/template" id="main_table_row"> <script type="text/template" id="main_table_row">
@ -208,6 +211,52 @@
console.log(e); console.log(e);
} }
var i = 0;
var dragging = false,
pageX = 0;
$('#dragbar').mousedown(function(e){
pageX = e.pageX;
e.preventDefault();
dragging = true;
var main = $('.J_recordDetailOverlay');
var ghostbar = $('<div>',{
id:'ghostbar',
css: {
height: main.outerHeight(),
top: main.offset().top,
left: main.offset().left
}
}).appendTo('body');
$(document).mousemove(function(e){
ghostbar.css("left",e.pageX);
});
});
$(document).mouseup(function(e){
if (dragging) {
var deltaPageX = e.pageX - pageX;
$('.J_recordDetailOverlay').css("width",$('.J_recordDetailOverlay').width() - deltaPageX);
$('.J_recordDetailOverlay').css("left",pageX + deltaPageX);
if($('.J_recordDetailOverlay').width()<=100){
$('.J_recordDetailOverlay').animate({
'right': $('.J_recordDetailOverlay').width()
},300,function(){
$('.J_escBtn').trigger('click');
});
}
pageX = e.pageX;
$('#ghostbar').remove();
$(document).unbind('mousemove');
dragging = false;
}
});
}); });
}); });
@ -298,8 +347,8 @@
background: #FFF; background: #FFF;
border-left: 1px solid #CCC; border-left: 1px solid #CCC;
top: 0; top: 0;
padding: 10px 10px 20px 10px; padding: 0;
overflow-y:scroll; overflow:hidden;
box-sizing: border-box; box-sizing: border-box;
-moz-box-sizing: border-box; -moz-box-sizing: border-box;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
@ -312,12 +361,31 @@
color: #777; color: #777;
cursor: pointer; cursor: pointer;
text-decoration: underline; text-decoration: underline;
z-index:1;
} }
.recordDetailOverlay li{ .recordDetailOverlay li{
white-space: nowrap; white-space: nowrap;
word-wrap: break-word; word-wrap: break-word;
} }
.J_recordDetailOverlayContentWrapper{
width:100%;
height:100%;
position:relative;
right:0;
overflow:scroll;
margin-left:3px;
}
.J_recordDetailOverlayContent{
padding:20px;
height:100%;
box-sizing: border-box;
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
content: "";
display: table;
clear: both;
}
.data_id{ .data_id{
color: #777; color: #777;
@ -340,6 +408,23 @@
{ {
color: #910A0A; color: #910A0A;
} }
#dragbar{
position:absolute;
left:0px;
background-color:black;
height:100%;
width: 3px;
cursor: col-resize;
}
#ghostbar{
width:3px;
background-color:#000;
opacity:0.5;
position:absolute;
cursor: col-resize;
z-index:999
}
</style> </style>
</body> </body>
</html> </html>