From 67a61874f10063e09948431acbde61c1f22839ca Mon Sep 17 00:00:00 2001 From: Leblanc Simon Date: Sun, 10 Jan 2010 23:02:05 +0000 Subject: [PATCH] =?UTF-8?q?Modification=20du=20fichier=20functions.js=20af?= =?UTF-8?q?in=20de=20v=C3=A9rifier=20chaque=20=C3=A9l=C3=A9ment=20DOM=20av?= =?UTF-8?q?ant=20leur=20utilisation=20Modification=20du=20fichier=20stripi?= =?UTF-8?q?t.py=20afin=20de=20n'avoir=20que=20des=20tabulations=20(et=20pa?= =?UTF-8?q?s=20un=20mix=20entre=20tabulation=20et=20espace)=20Suppression?= =?UTF-8?q?=20du=20todo=20concernant=20le=20namespace=20des=20creative=20c?= =?UTF-8?q?ommons=20dans=20la=20classe=20Strip?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- inc/class/strip.class.php | 1 - inc/tpl/functions.js | 72 ++++++++++++++++++++++----------------- stripit.py | 8 ++--- 3 files changed, 44 insertions(+), 37 deletions(-) diff --git a/inc/class/strip.class.php b/inc/class/strip.class.php index ba4882f..5940cec 100644 --- a/inc/class/strip.class.php +++ b/inc/class/strip.class.php @@ -99,7 +99,6 @@ class Strip * Parse the SVG file and call the setter of the object * * @access protected - * @todo look for resolv the problem with the namespace which change with Inkscape */ protected function parse() { diff --git a/inc/tpl/functions.js b/inc/tpl/functions.js index 6e08bb6..bcb777b 100644 --- a/inc/tpl/functions.js +++ b/inc/tpl/functions.js @@ -45,68 +45,60 @@ function getStrip(link) value = getNodeValue(item[i]); switch (id) { case 'png': - document.getElementById('strip').src = value; + if (idExist('strip')) document.getElementById('strip').src = value; break; case 'text': - document.getElementById('strip').alt = value; + if (idExist('strip')) document.getElementById('strip').alt = value; break; case 'title': - document.getElementById('title').innerHTML = '« ' + value + ' »'; + if (idExist('title')) document.getElementById('title').innerHTML = '« ' + value + ' »'; break; case 'description': - document.getElementById('description').innerHTML = value; + if (idExist('description')) document.getElementById('description').innerHTML = value; break; case 'comments': - document.getElementById('comments').innerHTML = value; + if (idExist('comments')) document.getElementById('comments').innerHTML = value; break; case 'author': - document.getElementById('author').innerHTML = '© ' + value; + if (idExist('author')) document.getElementById('author').innerHTML = '© ' + value; break; case 'date': - document.getElementById('date').innerHTML = value; + if (idExist('date')) document.getElementById('date').innerHTML = value; break; case 'license': - document.getElementById('link_license').innerHTML = value; - document.getElementById('link_license').href = value; + if (idExist('link_license')) { + document.getElementById('link_license').innerHTML = value; + document.getElementById('link_license').href = value; + } break; case 'source': - document.getElementById('link_source').href = value; + if (idExist('link_source')) document.getElementById('link_source').href = value; break; case 'navfirst': - document.getElementById('t_navfirst').href = value; - try { - document.getElementById('b_navfirst').href = value; - } catch (e) {} + if (idExist('t_navfirst')) document.getElementById('t_navfirst').href = value; + if (idExist('b_navfirst')) document.getElementById('b_navfirst').href = value; break; case 'navprev': - document.getElementById('t_navprev').href = value; - try { - document.getElementById('b_navprev').href = value; - } catch (e) {} + if (idExist('t_navprev')) document.getElementById('t_navprev').href = value; + if (idExist('b_navprev')) document.getElementById('b_navprev').href = value; break; case 'navnext': - document.getElementById('t_navnext').href = value; - try { - document.getElementById('b_navnext').href = value; - } catch (e) {} + if (idExist('t_navnext')) document.getElementById('t_navnext').href = value; + if (idExist('b_navnext')) document.getElementById('b_navnext').href = value; break; case 'navlast': - document.getElementById('t_navlast').href = value; - try { - document.getElementById('b_navlast').href = value; - } catch (e) {} + if (idExist('t_navlast')) document.getElementById('t_navlast').href = value; + if (idExist('b_navlast')) document.getElementById('b_navlast').href = value; break; case 'navgallery': - document.getElementById('t_navgallery').href = value; - try { - document.getElementById('b_navgallery').href = value; - } catch (e) {} + if (idExist('t_navgallery')) document.getElementById('t_navgallery').href = value; + if (idExist('b_navgallery')) document.getElementById('b_navgallery').href = value; break; case 'nav_forum_post': - document.getElementById('nav_forum_post').href = value; + if (idExist('nav_forum_post')) document.getElementById('nav_forum_post').href = value; break; case 'nav_forum_view': - document.getElementById('nav_forum_view').href = value; + if (idExist('nav_forum_view')) document.getElementById('nav_forum_view').href = value; break; } } @@ -134,3 +126,19 @@ function getNodeValue(node) return return_value; } + + +/** + * Vérifie l'existance d'un élément identifié par un identifiant + * + * @param string id L'identifiant à vérifier + * @return bool Vrai si l'élément existe, Faux sinon + */ +function idExist(id) +{ + if (document.getElementById(id)) { + return true; + } else { + return false; + } +} diff --git a/stripit.py b/stripit.py index 6672ecd..8dd5a4d 100755 --- a/stripit.py +++ b/stripit.py @@ -153,17 +153,17 @@ class Options: def print_usage(self): print self.usage - for o in self.options: + for o in self.options: fs = "\t-%s, --%s\t\t%s" # si pas un flag, indique qu'il faut un paramètre if not self.options[o]['flag']: fs = "\t-%s, --%s\t=VAL\t%s" - print fs % ( self.options[o]['short'], self.options[o]['long'], self.options[o]['description'] ) + print fs % ( self.options[o]['short'], self.options[o]['long'], self.options[o]['description'] ) def print_state(self): print "Options settings:" for o in self.options: - print "\t%s='%s' (%s)" % ( self.options[o]['long'], self.options[o]['value'], self.options[o]['origin'] ) + print "\t%s='%s' (%s)" % ( self.options[o]['long'], self.options[o]['value'], self.options[o]['origin'] ) def get( self, long ): return self.options[long]['value'] @@ -451,5 +451,5 @@ if __name__=="__main__": oo.get('user'), oo.get('dir'), oo.get('pass') - ) + )