Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project
This commit is contained in:
commit
50caa50898
|
@ -1,3 +1,4 @@
|
|||
#coding=utf-8
|
||||
class GamesController < ApplicationController
|
||||
layout "base_myshixun"
|
||||
skip_before_filter :verify_authenticity_token, :only => [:file_update]
|
||||
|
|
|
@ -140,33 +140,7 @@
|
|||
});
|
||||
}
|
||||
function extend_window(){
|
||||
var web_h = window.innerHeight;
|
||||
if($.browser.msie) {
|
||||
$(".content-half-fix").css("width", "42%");
|
||||
$(".content-half-fix").css("height", web_h - 168 + "px");
|
||||
}
|
||||
else if($.browser.safari)
|
||||
{
|
||||
$(".content-half-fix").css("width", "42%");
|
||||
$(".content-half-fix").css("height", web_h - 168 + "px");
|
||||
}
|
||||
else if($.browser.mozilla)
|
||||
{
|
||||
$(".content-half-fix").css("width", "42.5%");
|
||||
$(".content-half-fix").css("height", web_h - 158 + "px");
|
||||
}
|
||||
else if($.browser.opera) {
|
||||
$(".content-half-fix").css("width", "42%");
|
||||
}else if($.browser.chrome){
|
||||
if(window.navigator.userAgent.indexOf("MetaSr") == -1){
|
||||
$(".content-half-fix").css("width", "42.5%");
|
||||
$(".content-half-fix").css("height", web_h - 160 + "px");
|
||||
}else{
|
||||
$(".content-half-fix").css("width", "42.5%");
|
||||
$(".content-half-fix").css("height", web_h - 155 + "px");
|
||||
}
|
||||
}
|
||||
$(".content-half-fix").show();
|
||||
// $(".content-half-fix").show();
|
||||
}
|
||||
function hide_windows(){
|
||||
$(".content-half-fix").hide();
|
||||
|
|
|
@ -29,5 +29,6 @@
|
|||
});
|
||||
function file_edit_submit(){
|
||||
$('#file_update_id').submit();
|
||||
$("#bottom_save_edit").hide();
|
||||
}
|
||||
</script>
|
Loading…
Reference in New Issue