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

fixed A as menu item name, issue 987, thanks smogzer

Browse Source
This commit is contained in:
mdipierro
2012-07-16 13:13:45 -05:00
parent 2ae0ee0804
commit ded1292495
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.00.0 (2012-07-15 21:41:39) dev Version 2.00.0 (2012-07-16 13:13:40) dev
gluon/html.py
+5 -3
View File
@@ -455,7 +455,7 @@ def verifyURL(request, hmac_key=None, hash_vars=True, salt=None, user_signature=
# return whether or not the signature in the request matched the one we just generated # return whether or not the signature in the request matched the one we just generated
# (I.E. was the message the same as the one we originally signed) # (I.E. was the message the same as the one we originally signed)
return compare(original_sig, sig) return compare(original_sig, sig)
URL.verify = verifyURL URL.verify = verifyURL
@@ -1357,7 +1357,7 @@ class A(DIV):
(self['component'],self['target'] or '',d) (self['component'],self['target'] or '',d)
self['_href'] = self['_href'] or '#null' self['_href'] = self['_href'] or '#null'
elif self['callback']: elif self['callback']:
returnfalse="var e = arguments[0] || window.event; e.cancelBubble=true; if (e.stopPropagation) e.stopPropagation();" returnfalse="var e = arguments[0] || window.event; e.cancelBubble=true; if (e.stopPropagation) e.stopPropagation();"
if d: if d:
self['_onclick']="if(confirm(w2p_ajax_confirm_message||'Are you sure you want o delete this object?')){ajax('%s',[],'%s');%s};%s" % \ self['_onclick']="if(confirm(w2p_ajax_confirm_message||'Are you sure you want o delete this object?')){ajax('%s',[],'%s');%s};%s" % \
(self['callback'],self['target'] or '',d, returnfalse) (self['callback'],self['target'] or '',d, returnfalse)
@@ -2147,6 +2147,8 @@ class MENU(DIV):
li = LI(DIV(name)) li = LI(DIV(name))
elif link: elif link:
li = LI(A(name, _href=link)) li = LI(A(name, _href=link))
elif not link and isinstance(name,A):
li = LI(name)
else: else:
li = LI(A(name, _href='#', li = LI(A(name, _href='#',
_onclick='javascript:void(0);return false;')) _onclick='javascript:void(0);return false;'))
@@ -2166,7 +2168,7 @@ class MENU(DIV):
if not select: if not select:
select = SELECT(**self.attributes) select = SELECT(**self.attributes)
for item in data: for item in data:
if len(item) <= 4 or item[4] == True: if len(item) <= 4 or item[4] == True:
if item[2]: if item[2]:
select.append(OPTION(CAT(prefix, item[0]), _value=item[2], _selected=item[1])) select.append(OPTION(CAT(prefix, item[0]), _value=item[2], _selected=item[1]))
if len(item)>3 and len(item[3]): if len(item)>3 and len(item[3]):