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.

Sign up for GitHub

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

Jump to bottom

A fourth composite pull request #80

Merged
merged 14 commits into from
Oct 15, 2019
Merged

A fourth composite pull request #80

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
13aadda
Kernel#CSS: Make it work with an arbitrary Document
hmdne Oct 3, 2019
5f9a114
Kernel#DOM: Update documentation
hmdne Oct 3, 2019
06bc506
Iframe#content_document: Support an edge case
hmdne Oct 3, 2019
98b6635
Implement Browser#resolve_after.
hmdne Oct 3, 2019
7781a2d
Implement Browser.restricted?. Handle Restricted objects.
hmdne Oct 3, 2019
a11d594
Implement `File`, `Blob` and `DataTransfer`. Fixes opal/opal-browser#35
hmdne Oct 10, 2019
58bbb85
blob: Small amendments
hmdne Oct 11, 2019
8071ac3
event/data_transfer: Small yard documentation fix
hmdne Oct 11, 2019
33e1246
Implement `FormData`. Refactor query string generation.
hmdne Oct 11, 2019
b616f41
css: Fix an off-by-one issue, as reported by @elia
hmdne Oct 15, 2019
554d3e8
blob, form_data: Fix EOF newline; style
hmdne Oct 15, 2019
3c0e254
NativeCachedWrapper: reimplement in JS the restrictedness check
hmdne Oct 15, 2019
075ce76
dom/element: move Element#click from effects.rb to dom/element.rb
hmdne Oct 15, 2019
56c34f3
dom/element/form: implement the DOM interface
hmdne Oct 15, 2019
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
28 changes: 21 additions & 7 deletions opal/browser/css.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,33 @@
require 'browser/css/rule/style'

module Kernel
# Create a <style> element from a string or a block using the
# {Paggio::CSS} DSL.
# @overload CSS(document = $document, &block)
#
# @param text [String] the CSS text
# @return [Browser::DOM::Element] the create <style> element
def CSS(text = nil, &block)
style = $document.create_element(:style)
# Create a `<style>` element from a {Paggio::CSS} DSL.
#
# @param document [Browser::DOM::Document] the document instance
# we intend to use
#
# @return [Browser::DOM::Element] the created `<style>` element
#
# @overload CSS(string, document = $document)
#
# Create a `<style>` element from a string.
#
# @param document [Browser::DOM::Document] the document instance
# we intend to use
#
# @return [Browser::DOM::Element] the created `<style>` element
def CSS(*args, &block)
document = args.pop || $document
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this, I think, needs to be solved in another way, what if I just pass the css text as first argument… wouldn't it pop the last element from args which happens to also be the first one?

I'd suggest def CSS(text = nil, document = $document, &block), or a check to see if the argument is a String, or —maybe better— use the if block check as it's done in DOM(…).


style = document.create_element(:style)
style[:type] = 'text/css'

if block
style.inner_text = Paggio.css(&block)
else
style.inner_text = text
style.inner_text = args.join("")
end

style
Expand Down