Modification du fichier functions.js afin de vérifier chaque élément DOM avant leur utilisation
Modification du fichier stripit.py afin de n'avoir que des tabulations (et pas un mix entre tabulation et espace) Suppression du todo concernant le namespace des creative commons dans la classe Strip
This commit is contained in:
Leblanc Simon
parent
69bff74fcd
commit
67a61874f1
3 changed files with 44 additions and 37 deletions
|
|
@ -99,7 +99,6 @@ class Strip
|
||||||
* Parse the SVG file and call the setter of the object
|
* Parse the SVG file and call the setter of the object
|
||||||
*
|
*
|
||||||
* @access protected
|
* @access protected
|
||||||
* @todo look for resolv the problem with the namespace which change with Inkscape
|
|
||||||
*/
|
*/
|
||||||
protected function parse()
|
protected function parse()
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -45,68 +45,60 @@ function getStrip(link)
|
||||||
value = getNodeValue(item[i]);
|
value = getNodeValue(item[i]);
|
||||||
switch (id) {
|
switch (id) {
|
||||||
case 'png':
|
case 'png':
|
||||||
document.getElementById('strip').src = value;
|
if (idExist('strip')) document.getElementById('strip').src = value;
|
||||||
break;
|
break;
|
||||||
case 'text':
|
case 'text':
|
||||||
document.getElementById('strip').alt = value;
|
if (idExist('strip')) document.getElementById('strip').alt = value;
|
||||||
break;
|
break;
|
||||||
case 'title':
|
case 'title':
|
||||||
document.getElementById('title').innerHTML = '« ' + value + ' »';
|
if (idExist('title')) document.getElementById('title').innerHTML = '« ' + value + ' »';
|
||||||
break;
|
break;
|
||||||
case 'description':
|
case 'description':
|
||||||
document.getElementById('description').innerHTML = value;
|
if (idExist('description')) document.getElementById('description').innerHTML = value;
|
||||||
break;
|
break;
|
||||||
case 'comments':
|
case 'comments':
|
||||||
document.getElementById('comments').innerHTML = value;
|
if (idExist('comments')) document.getElementById('comments').innerHTML = value;
|
||||||
break;
|
break;
|
||||||
case 'author':
|
case 'author':
|
||||||
document.getElementById('author').innerHTML = '© ' + value;
|
if (idExist('author')) document.getElementById('author').innerHTML = '© ' + value;
|
||||||
break;
|
break;
|
||||||
case 'date':
|
case 'date':
|
||||||
document.getElementById('date').innerHTML = value;
|
if (idExist('date')) document.getElementById('date').innerHTML = value;
|
||||||
break;
|
break;
|
||||||
case 'license':
|
case 'license':
|
||||||
document.getElementById('link_license').innerHTML = value;
|
if (idExist('link_license')) {
|
||||||
document.getElementById('link_license').href = value;
|
document.getElementById('link_license').innerHTML = value;
|
||||||
|
document.getElementById('link_license').href = value;
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case 'source':
|
case 'source':
|
||||||
document.getElementById('link_source').href = value;
|
if (idExist('link_source')) document.getElementById('link_source').href = value;
|
||||||
break;
|
break;
|
||||||
case 'navfirst':
|
case 'navfirst':
|
||||||
document.getElementById('t_navfirst').href = value;
|
if (idExist('t_navfirst')) document.getElementById('t_navfirst').href = value;
|
||||||
try {
|
if (idExist('b_navfirst')) document.getElementById('b_navfirst').href = value;
|
||||||
document.getElementById('b_navfirst').href = value;
|
|
||||||
} catch (e) {}
|
|
||||||
break;
|
break;
|
||||||
case 'navprev':
|
case 'navprev':
|
||||||
document.getElementById('t_navprev').href = value;
|
if (idExist('t_navprev')) document.getElementById('t_navprev').href = value;
|
||||||
try {
|
if (idExist('b_navprev')) document.getElementById('b_navprev').href = value;
|
||||||
document.getElementById('b_navprev').href = value;
|
|
||||||
} catch (e) {}
|
|
||||||
break;
|
break;
|
||||||
case 'navnext':
|
case 'navnext':
|
||||||
document.getElementById('t_navnext').href = value;
|
if (idExist('t_navnext')) document.getElementById('t_navnext').href = value;
|
||||||
try {
|
if (idExist('b_navnext')) document.getElementById('b_navnext').href = value;
|
||||||
document.getElementById('b_navnext').href = value;
|
|
||||||
} catch (e) {}
|
|
||||||
break;
|
break;
|
||||||
case 'navlast':
|
case 'navlast':
|
||||||
document.getElementById('t_navlast').href = value;
|
if (idExist('t_navlast')) document.getElementById('t_navlast').href = value;
|
||||||
try {
|
if (idExist('b_navlast')) document.getElementById('b_navlast').href = value;
|
||||||
document.getElementById('b_navlast').href = value;
|
|
||||||
} catch (e) {}
|
|
||||||
break;
|
break;
|
||||||
case 'navgallery':
|
case 'navgallery':
|
||||||
document.getElementById('t_navgallery').href = value;
|
if (idExist('t_navgallery')) document.getElementById('t_navgallery').href = value;
|
||||||
try {
|
if (idExist('b_navgallery')) document.getElementById('b_navgallery').href = value;
|
||||||
document.getElementById('b_navgallery').href = value;
|
|
||||||
} catch (e) {}
|
|
||||||
break;
|
break;
|
||||||
case 'nav_forum_post':
|
case 'nav_forum_post':
|
||||||
document.getElementById('nav_forum_post').href = value;
|
if (idExist('nav_forum_post')) document.getElementById('nav_forum_post').href = value;
|
||||||
break;
|
break;
|
||||||
case 'nav_forum_view':
|
case 'nav_forum_view':
|
||||||
document.getElementById('nav_forum_view').href = value;
|
if (idExist('nav_forum_view')) document.getElementById('nav_forum_view').href = value;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -134,3 +126,19 @@ function getNodeValue(node)
|
||||||
|
|
||||||
return return_value;
|
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;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -153,17 +153,17 @@ class Options:
|
||||||
def print_usage(self):
|
def print_usage(self):
|
||||||
print self.usage
|
print self.usage
|
||||||
|
|
||||||
for o in self.options:
|
for o in self.options:
|
||||||
fs = "\t-%s, --%s\t\t%s"
|
fs = "\t-%s, --%s\t\t%s"
|
||||||
# si pas un flag, indique qu'il faut un paramètre
|
# si pas un flag, indique qu'il faut un paramètre
|
||||||
if not self.options[o]['flag']:
|
if not self.options[o]['flag']:
|
||||||
fs = "\t-%s, --%s\t=VAL\t%s"
|
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):
|
def print_state(self):
|
||||||
print "Options settings:"
|
print "Options settings:"
|
||||||
for o in self.options:
|
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 ):
|
def get( self, long ):
|
||||||
return self.options[long]['value']
|
return self.options[long]['value']
|
||||||
|
|
@ -451,5 +451,5 @@ if __name__=="__main__":
|
||||||
oo.get('user'),
|
oo.get('user'),
|
||||||
oo.get('dir'),
|
oo.get('dir'),
|
||||||
oo.get('pass')
|
oo.get('pass')
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue