Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

support julia 0.6 #203

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
language: julia
julia:
- 0.4
- 0.5
- 0.6
- nightly
notifications:
email: false
Expand Down
4 changes: 2 additions & 2 deletions REQUIRE
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
julia 0.4
julia 0.5
ArgParse
Colors
Compat 0.9.0
Compat 0.17.0
Dates
JSON 0.7
Markdown
Expand Down
1 change: 0 additions & 1 deletion src/Escher.jl
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ else
end

export @md_str, @md_mstr
#@docstrings

using Compat
using Patchwork
Expand Down
2 changes: 1 addition & 1 deletion src/basics/animation.jl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
abstract Animation
@compat abstract type Animation end

# https://www.polymer-project.org/platform/web-animations.html
# https://www.polymer-project.org/docs/elements/core-elements.html#core-animation
6 changes: 3 additions & 3 deletions src/basics/behavior.jl
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ render(t::WithStates, state) =
)
)

@doc "Watch for changes to an attribute/property." ->
"Watch for changes to an attribute/property."
function hasstate(tile::Tile; attr::AbstractString="value", trigger::AbstractString="change", selector::AbstractString="::parent")
hasstates(tile; triggers=Dict(attr=>trigger), selector=selector)
end
Expand Down Expand Up @@ -74,7 +74,7 @@ default_intent(k::Keypress) = KeyIntent()
interpret(::KeyIntent, d) =
Key(d["key"], d["alt"], d["ctrl"], d["meta"], d["shift"])

abstract MouseButton
@compat abstract type MouseButton end

@terms MouseButton begin
nobutton => NoButton
Expand Down Expand Up @@ -145,7 +145,7 @@ default_intent(t::Selectable) = begin
end


abstract MouseState
@compat abstract type MouseState end

@terms MouseState begin
mousedown => MouseDown
Expand Down
4 changes: 2 additions & 2 deletions src/basics/component.jl
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export Component,
"""
The abstract type for all Components
"""
abstract Component
@compat abstract type Component end

"""
The view of a component
Expand All @@ -26,7 +26,7 @@ convert(::Type{Tile}, c::Component) = view(c)
An action by/of a component - can be obtained from
the intent set in the view
"""
abstract Action <: Intent
@compat abstract type Action <: Intent end

"""
Given a `Component` and an `Action` transition to
Expand Down
2 changes: 1 addition & 1 deletion src/basics/embellishment.jl
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ render(t::BorderWidth, state) =
render(t.tile, state) &
style(mapparts(allsides, t.sides, "border", "Width", t.width))

abstract StrokeStyle
@compat abstract type StrokeStyle end

@terms StrokeStyle begin
noborder => NoStroke
Expand Down
18 changes: 9 additions & 9 deletions src/basics/layout.jl
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,8 @@ container(w, h) =
end

# 1. Placing a Tile inside another
abstract Position
abstract Corner <: Position
@compat abstract type Position end
@compat abstract type Corner <: Position end

@terms Corner begin
topleft => TopLeft
Expand Down Expand Up @@ -213,16 +213,16 @@ end

# 2. Axes, Directions and Flow

abstract Axis
@compat abstract type Axis end

abstract FixedAxis <: Axis
@compat abstract type FixedAxis <: Axis end
@terms FixedAxis begin
horizontal => Horizontal
vertical => Vertical
depth => Depth
end

abstract Side{Perpendicular <: Axis}
@compat abstract type Side{Perpendicular <: Axis} end
@terms Side{Horizontal} begin
left => Left
right => Right
Expand All @@ -245,7 +245,7 @@ end

# TODO: render inward, outward flow

abstract FlowRelativeAxis <: Axis
@compat abstract type FlowRelativeAxis <: Axis end
@terms FlowRelativeAxis begin
mainaxis => MainAxis
crossaxis => CrossAxis
Expand All @@ -261,7 +261,7 @@ end
crossend => CrossEnd
end

abstract FlexContainer <: Tile
@compat abstract type FlexContainer <: Tile end

render(f::FlexContainer, state) =
addclasses(render(f.tile, state), classes(f))
Expand Down Expand Up @@ -401,7 +401,7 @@ flex{T <: Real}(factor::AbstractVector{T}) = t -> flex(factor, t)
end

# Flow alignment
abstract Packing
@compat abstract type Packing end

@terms Packing begin
axisstart => AxisStart
Expand Down Expand Up @@ -494,7 +494,7 @@ end

# Clipping

abstract Overflow
@compat abstract type Overflow end

@terms Overflow begin
hidden => Hidden
Expand Down
12 changes: 6 additions & 6 deletions src/basics/length.jl
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@ using Measures

export mm, cm, inch, pt, em, px, vw, vh, vmin, cent

@doc " 1em " ->
" 1em "
const em = Length(:em,1.0)
@doc " 1em " ->
" 1em "
const px = Length(:px,1.0)
@doc " 1vw " ->
" 1vw "
const vw = Length(:vw, 1.0)
@doc " 1vh " ->
" 1vh "
const vh = Length(:vh, 1.0)
@doc " 1vmin " ->
" 1vmin "
const vmin = Length(:vmin, 1.0)
@doc " 1 percent " ->
" 1 percent "
const cent = Length(:cent, 1.0)

Base.convert(::Type{Length}, x::Real) =
Expand Down
Loading