Skip to content

Commit

Permalink
Fix rheia to support latest Firefox and chrome
Browse files Browse the repository at this point in the history
  • Loading branch information
feugy committed Nov 3, 2015
1 parent 55884a5 commit 13bd23b
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 37 deletions.
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -50,7 +50,7 @@ Grab the code from github:

> git clone https://github.com/feugy/mythic-forge
Then follows [Build instructions](blob/master/docs/Build.md)
Then follows [Build instructions](docs/Build.md)


## Project layout
Expand Down
17 changes: 9 additions & 8 deletions rheia/src/utils/extensions.coffee
@@ -1,6 +1,6 @@
###
Copyright 2010~2014 Damien Feugas
This file is part of Mythic-Forge.
Myth is free software: you can redistribute it and/or modify
Expand Down Expand Up @@ -32,7 +32,7 @@ define [
reverseStr: _string.reverse

# enhance Backbone views with close() mechanism
_.extend Backbone.View.prototype,
_.extend Backbone.View.prototype,

# **protected**
# For views that wants templating, put their the string version of a mustache template,
Expand Down Expand Up @@ -60,7 +60,7 @@ define [
debugger unless emitter?
emitter.on events, callback
@_bounds.push [emitter, events, callback]

# Unbounds a callback of this view from the specified emitter
#
# @param emitter [Backbone.Event] the emitter on which callback is unbound
Expand All @@ -86,8 +86,8 @@ define [
# if a template is defined, use it
render: () ->
# template rendering
if @_template?
# first compilation if necessary
if @_template?
# first compilation if necessary
@_template = Hogan.compile @_template if _.isString @_template
# then rendering
@$el.empty().append @_template.render @_getRenderData()
Expand All @@ -104,12 +104,13 @@ define [
prefix = if $.browser.webkit or $.browser.chrome then 'webkit' else 'moz'

# define a getter for page visibility
Object.defineProperty document, 'hidden',
Object.defineProperty document, 'hidden',
get: () ->
document["#{prefix}Hidden"]
# unified event name
$(document).on "#{prefix}visibilitychange", (event) -> $(document).trigger 'visibilitychange', event

# use same name for animation frames facilities
window.requestAnimationFrame = window[prefix+'RequestAnimationFrame']
window.cancelAnimationFrame = window[prefix+'CancelAnimationFrame']
unless window.requestAnimationFrame?
window.requestAnimationFrame = window[prefix+'RequestAnimationFrame']
window.cancelAnimationFrame = window[prefix+'CancelAnimationFrame']
58 changes: 30 additions & 28 deletions rheia/style/rheia.styl
@@ -1,6 +1,6 @@
/*
Copyright 2010~2014 Damien Feugas
This file is part of Mythic-Forge.
Myth is free software: you can redistribute it and/or modify
Expand All @@ -21,7 +21,7 @@
@import 'jquery-ui.css'
@import 'jquery-ui-numeric.css'
@import 'jquery-timepicker-addon.css'
@import 'constants'
@import 'constants'
@import 'reset'
@import 'mixins'

Expand Down Expand Up @@ -60,7 +60,7 @@ select
padding 0.5em 1em

.tooltip
padding 0.5em
padding 0.5em
cursor default

*
Expand All @@ -84,14 +84,14 @@ select

var
background-color hoverColor

.menu.open
.menu.toggleable
.menu.toggleable
.tooltip
z-index 10
opacity 1

.menu.toggleable li
.menu.toggleable li
font-size fontSize*0.8

i
Expand All @@ -102,8 +102,8 @@ select

// Button

.action-bars .ui-button
.action-bar .ui-button
.action-bars .ui-button
.action-bar .ui-button
.action.ui-button
display: inline-block;
margin-right 10px
Expand Down Expand Up @@ -143,7 +143,7 @@ for name in question warning cancel
.ui-button-text-icon-primary .ui-button-text
padding-left 2.3em

.ui-widget-overlay
.ui-widget-overlay
opacity 0.7

// Validators
Expand All @@ -155,14 +155,14 @@ textarea.validation-error

// JQuery ui dialogs

.ui-dialog
.ui-dialog
min-height 175px
min-width 480px

*
font-size 14px

.ui-dialog-content
.ui-dialog-content
min-height 150px
min-width 450px
line-height fontSize*1.5
Expand Down Expand Up @@ -210,7 +210,7 @@ body
background-repeat no-repeat
background-position center top

.layout
.layout
.login-view
display flex
flex-direction column
Expand Down Expand Up @@ -263,8 +263,8 @@ body
.deployement
position absolute
right 0px
i

i
display inline-block
font-style normal
font-weight bold
Expand All @@ -276,11 +276,11 @@ body
i
margin-right 0.5em

.deployement
.deployement
margin-right 200px
top 12px
visibility hidden

i
background url('images/round-loader.gif')
height 16px
Expand All @@ -294,6 +294,7 @@ body
> .container
display flex
flex-grow 1
height 1%

> *
display flex
Expand Down Expand Up @@ -324,9 +325,9 @@ body

.loadable.selected
box-shadow: 0 0 10px 5px #AAA

.name-choose-popup

input.name
display block
width 350px
Expand Down Expand Up @@ -377,17 +378,18 @@ body

> .right
flex-shrink 1

> *
flex-shrink 0

.ui-tabs
.ui-tabs
flex-grow 1
flex-shrink 1

.ui-tabs.views
display flex
flex-direction column
overflow auto

.ui-tabs-nav
width 100%
Expand All @@ -410,7 +412,7 @@ body
.ui-tabs-nav li a
padding: 0.2em 0.5em
typeIcons '.icon', 25, 0

// views
.view

Expand All @@ -429,7 +431,7 @@ body

> *
padding 0.5em 1em
*
*
color white

.ui-icon
Expand All @@ -438,10 +440,10 @@ body
> .external-change
width auto
margin 0

> *
margin 2px 10px 5px

.images
padding-top 0.5em

Expand Down Expand Up @@ -474,7 +476,7 @@ body
border-collapse collapse
width 100%

th
th
table-header()
padding 0.5em 1em

Expand Down Expand Up @@ -511,7 +513,7 @@ body
background-repeat no-repeat
background-size auto 150px

.container
.container
align-items center
align-self center

Expand Down Expand Up @@ -544,7 +546,7 @@ body
a.login
margin-top 1em

fieldset
fieldset
padding 2px 0

> *
Expand All @@ -564,7 +566,7 @@ body
.connect.twitter
.connect.github
color white

connect-button '.connect.google', 0
connect-button '.connect.twitter', 2
connect-button '.connect.github', 3
Expand Down

0 comments on commit 13bd23b

Please sign in to comment.