0x2620/pandora
2
1
Fork 1
Code Issues 1.3k Pull requests Releases Wiki Activity

Compare commits

base: 0x2620:1b1442e66480c3dbaaa78370eff4eab0f6b14e65
Branches Tags
0x2620:master
0x2620:stable
..
compare: 0x2620:a8aa619217bff2bba65468d75df331f03957d016
Branches Tags
0x2620:master
0x2620:stable

No commits in common. "1b1442e66480c3dbaaa78370eff4eab0f6b14e65" and "a8aa619217bff2bba65468d75df331f03957d016" have entirely different histories.
1b1442e664 ... a8aa619217

2 changed files with 17 additions and 21 deletions
Show stats Expand all files Collapse all files

36
static/js/helpDialog.js
View file

@ -137,26 +137,24 @@ pandora.ui.helpDialog = function() {
that.select = function(id) { that.select = function(id) {
var img, $img; var img, $img;
if ($text) { $text.html(text[id || 'help']).scrollTop(0);
$text.html(text[id || 'help']).scrollTop(0); img = $text.find('img');
img = $text.find('img'); if (img) {
if (img) { $img = $(img);
$img = $(img); $img.replaceWith(
$img.replaceWith( $image = Ox.ImageElement(
$image = Ox.ImageElement( Ox.extend(getImageSize(), {src: $img.attr('src')})
Ox.extend(getImageSize(), {src: $img.attr('src')}) )
) .css({borderRadius: '8px'})
.css({borderRadius: '8px'}) );
);
}
$text.find('td:first-child')
.css({
height: '16px',
paddingRight: '8px',
textAlign: 'right',
whiteSpace: 'nowrap'
});
} }
$text.find('td:first-child')
.css({
height: '16px',
paddingRight: '8px',
textAlign: 'right',
whiteSpace: 'nowrap'
});
return that; return that;
} }

2
update.py
View file

@ -322,7 +322,6 @@ if __name__ == "__main__":
current_branch = get_branch(path) current_branch = get_branch(path)
revno = get_version(path) revno = get_version(path)
if repo == 'pandora': if repo == 'pandora':
print("Pandora Version pre update: ", revno)
pandora_old_revno = revno pandora_old_revno = revno
current += revno current += revno
if current_branch != branch: if current_branch != branch:
@ -346,7 +345,6 @@ if __name__ == "__main__":
new += '+' new += '+'
os.chdir(join(base, 'pandora')) os.chdir(join(base, 'pandora'))
if pandora_old_revno != pandora_new_revno: if pandora_old_revno != pandora_new_revno:
print("Pandora Version post update: ", pandora_new_revno)
os.chdir(base) os.chdir(base)
run('./update.py', 'postupdate', pandora_old_revno, pandora_new_revno) run('./update.py', 'postupdate', pandora_old_revno, pandora_new_revno)
os.chdir(join(base, 'pandora')) os.chdir(join(base, 'pandora'))