Skip to content

Fix for flash/images #36

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

Open
Xerasin wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix for flash/images #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
840ea5c
Header no longer needed
Xerasin Mar 4, 2012
f0ebf61
Pointless to comment them.
Xerasin Mar 4, 2012
c68990d
Merge pull request #3 from sk89q/master
Xerasin Nov 25, 2012
dd7a949
- Fix flash Provider
Xerasin Nov 25, 2012
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
13 changes: 10 additions & 3 deletions src/PlayX/lua/entities/gmod_playx/cl_init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ function ENT:SetProjectorBounds(forward, right, up)
end

function ENT:CreateBrowser()
self.Browser = vgui.Create("HTML")
self.Browser = vgui.Create("DHTML")
self.Browser:SetMouseInputEnabled(false)
self.Browser:SetSize(self.HTMLWidth, self.HTMLHeight)
self.Browser:SetPaintedManually(true)
Expand Down Expand Up @@ -195,7 +195,13 @@ function ENT:Play(handler, uri, start, volume, handlerArgs)
if not self.Browser then
self:CreateBrowser()
end


self.Browser:AddFunction("gmod","Ready",function()
if not IsValid(self) then return end
MsgN("PlayX DEBUG: Page loaded, preparing to inject")
self:InjectPage()
end)

self.Browser.OpeningURL = function(_, url, target, postdata)
local query = url:match("^http://playx.sktransport/%?(.*)$")

Expand All @@ -221,7 +227,8 @@ function ENT:Play(handler, uri, start, volume, handlerArgs)
else
self.Browser:OpenURL(PlayX.HostURL)
end


self.Browser:QueueJavascript("gmod.Ready()")
self.Playing = true
end

Expand Down
5 changes: 2 additions & 3 deletions src/PlayX/lua/playxlib.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,8 +379,7 @@ playxlib.HandlerResult = HandlerResult
-- Make callable
local mt = {}
mt.__call = function(...)
local arg = {...}
return HandlerResult.new(unpack(arg))
return HandlerResult.new(...)
end
setmetatable(HandlerResult, mt)

Expand Down Expand Up @@ -556,7 +555,7 @@ setInterval(function() {

local body = [[
<div style="width: ]] .. width .. [[px; height: ]] .. height .. [[px; overflow: hidden">
<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
<object
type="application/x-shockwave-flash"
src="]] .. url .. [["
width="100%" height="100%" id="player">
Expand Down