dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reverted https://github.com/mdipierro/web2py/commit/36f3571590f84755103d1ce74868875dbd6f7d53 and fixed a backward compatibility issue

Browse Source
This commit is contained in:
Massimo Di Pierro
2012-03-03 00:00:05 -06:00
parent 1be5ca9d2e
commit 1f8754155b
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 1.99.6 (2012-03-02 20:26:11) stable Version 1.99.6 (2012-03-02 23:59:45) stable
gluon/compileapp.py
+1 -4
View File
@@ -122,9 +122,6 @@ def LOAD(c=None, f='index', args=None, vars=None,
is added on page loading without delay. is added on page loading without delay.
""" """
from html import TAG, DIV, URL, SCRIPT, XML from html import TAG, DIV, URL, SCRIPT, XML
create_div = True
if target is not None:
create_div = False
if args is None: args = [] if args is None: args = []
vars = Storage(vars or {}) vars = Storage(vars or {})
target = target or 'c'+str(random.random())[2:] target = target or 'c'+str(random.random())[2:]
@@ -157,7 +154,7 @@ def LOAD(c=None, f='index', args=None, vars=None,
else: else:
statement = "web2py_component('%s','%s');" % (url, target) statement = "web2py_component('%s','%s');" % (url, target)
script = SCRIPT(statement, _type="text/javascript") script = SCRIPT(statement, _type="text/javascript")
if create_div: if not content is None:
return TAG[''](script, DIV(content,**attr)) return TAG[''](script, DIV(content,**attr))
else: else:
return TAG[''](script) return TAG[''](script)