bug fixing & tidying
This commit is contained in:
parent
627ecdbf4c
commit
d8c394c7a5
@ -20,7 +20,7 @@ class ResolutionLimit implements Extension {
|
||||
|
||||
if($min_w > 0 && $image->width < $min_w) throw new UploadException("Image too small");
|
||||
if($min_h > 0 && $image->height < $min_h) throw new UploadException("Image too small");
|
||||
if($max_w > 0 && $image->width > $min_w) throw new UploadExceptiono("Image too large");
|
||||
if($max_w > 0 && $image->width > $min_w) throw new UploadException("Image too large");
|
||||
if($max_h > 0 && $image->height > $min_h) throw new UploadException("Image too large");
|
||||
|
||||
if(count($ratios) > 0) {
|
||||
|
@ -1,20 +1,17 @@
|
||||
<?php
|
||||
class TagHistoryTest extends ShimmieWebTestCase {
|
||||
function testTagHistory() {
|
||||
$this->log_in_as_user();
|
||||
$this->log_in_as_admin();
|
||||
$image_id = $this->post_image("ext/simpletest/data/pbx_screenshot.jpg", "pbx");
|
||||
$this->get_page("post/view/$image_id");
|
||||
$this->assertTitle("Image $image_id: pbx");
|
||||
$this->setField("tags", "new");
|
||||
$this->setField("tag_edit__tags", "new");
|
||||
$this->click("Set");
|
||||
$this->assertTitle("Image $image_id: new");
|
||||
$this->click("Tag History");
|
||||
$this->assertText("new (Set by test");
|
||||
$this->assertText("new (Set by demo");
|
||||
$this->click("Revert");
|
||||
$this->assertTitle("Image $image_id: pbx");
|
||||
$this->log_out();
|
||||
|
||||
$this->log_in_as_admin();
|
||||
$this->delete_image($image_id);
|
||||
$this->log_out();
|
||||
}
|
||||
|
@ -77,7 +77,7 @@ EOD;
|
||||
$html = "";
|
||||
$i = str_replace(' ', '_', $h) . $salt;
|
||||
if($hidable) $html .= "
|
||||
<script>
|
||||
<script><!--
|
||||
$(document).ready(function() {
|
||||
$(\"#$i-toggle\").click(function() {
|
||||
$(\"#$i\").slideToggle(\"slow\", function() {
|
||||
@ -93,7 +93,7 @@ EOD;
|
||||
$(\"#$i\").hide();
|
||||
}
|
||||
});
|
||||
</script>
|
||||
//--></script>
|
||||
";
|
||||
if(!is_null($h)) $html .= "
|
||||
<div class='hrr' id='$i-toggle'>
|
||||
|
Loading…
x
Reference in New Issue
Block a user