ulysia/szurubooru
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Optimalization: simplified selectors

Browse source 
Squash
This commit is contained in:
Marcin Kurczewski 2013-11-30 14:22:49 +01:00
parent dd8ab7c001
commit 01c54d4d83
16 changed files with 34 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
public_html/media/js/core.js
View file

@ -83,8 +83,8 @@ $(function()
}
}
$('form[data-confirm-text]').submit(confirmEvent);
$('a[data-confirm-text]').click(confirmEvent);
$('form.confirmable').submit(confirmEvent);
$('a.confirmable').click(confirmEvent);
//simple action buttons
@ -123,7 +123,7 @@ $(function()
//attach data from submit buttons to forms before .submit() gets called
$(':submit').each(function()
$('.submit').each(function()
{
$(this).click(function()
{

2
src/Controllers/PostController.php
View file

@ -511,7 +511,7 @@ class PostController
throw new SimpleException('Thumbnail file is not readable');
$this->context->layoutName = 'layout-file';
$this->context->transport->cacheDaysToLive = 30;
$this->context->transport->cacheDaysToLive = 365;
$this->context->transport->mimeType = 'image/jpeg';
$this->context->transport->fileHash = 'thumb' . md5($name . filemtime($path));
$this->context->transport->filePath = $path;

2
src/Views/auth-login.phtml
View file

@ -16,7 +16,7 @@
<div>
<label class="left">&nbsp;</label>
<div class="input-wrapper">
<button type="submit">Log in</button>
<button class="submit" type="submit">Log in</button>
&nbsp;
<input type="hidden" name="remember" value="0"/>
<label>

2
src/Views/comment-small.phtml
View file

@ -27,7 +27,7 @@
<?php if (PrivilegesHelper::confirm(Privilege::DeleteComment, PrivilegesHelper::getIdentitySubPrivilege($this->context->comment->commenter))): ?>
<span class="delete">
<a class="simple-action" href="<?php echo \Chibi\UrlHelper::route('comment', 'delete', ['id' => $this->context->comment->id]) ?>" data-confirm-text="Are you sure you want to delete this comment?">
<a class="simple-action confirmable" href="<?php echo \Chibi\UrlHelper::route('comment', 'delete', ['id' => $this->context->comment->id]) ?>" data-confirm-text="Are you sure you want to delete this comment?">
delete
</a>
</span>

2
src/Views/post-edit.phtml
View file

@ -62,6 +62,6 @@
<div>
<label class="left">&nbsp;</label>
<button type="submit">Submit</button>
<button class="submit" type="submit">Submit</button>
</div>
</form>

4
src/Views/post-upload.phtml
View file

@ -41,7 +41,7 @@
<div id="url-handler">
<div class="input-wrapper"><textarea placeholder="Paste some URLs here, one per line." name="urls"></textarea></div>
</div>
<button type="submit">Add</button>
<button class="submit" type="submit">Add</button>
</div>
</div>
@ -55,7 +55,7 @@
</div>
<div class="submit-wrapper">
<button id="the-submit" type="submit">Submit</button>
<button id="the-submit" class="submit" type="submit">Submit</button>
</div>
</div>

4
src/Views/post-view.phtml
View file

@ -341,8 +341,8 @@
<input type="hidden" name="submit" value="1"/>
<div>
<button name="sender" type="submit" value="preview">Preview</button>&nbsp;
<button name="sender" type="submit" value="submit">Submit</button>
<button name="sender" class="submit" type="submit" value="preview">Preview</button>&nbsp;
<button name="sender" class="submit" type="submit" value="submit">Submit</button>
</div>
</form>
<?php endif ?>

18
src/Views/sidebar-options.phtml
View file

@ -6,6 +6,8 @@
<?php foreach ($this->context->options as $option): ?>
<li class="<?php echo $option['class']; if (isset($option['inactive'])) echo ' inactive' ?>">
<?php
$class = [];
$attrs = [];
if (!empty($option['link']))
{
@ -14,14 +16,22 @@
elseif (!empty($option['simple-action']))
{
$attrs['href'] = $option['simple-action'];
$attrs['class'] = 'simple-action';
$class []= 'simple-action';
if (isset($option['data-confirm-text']))
{
$attrs['data-confirm-text'] = $option['data-confirm-text'];
$class []= 'confirmable';
}
if (isset($option['data-redirect-url']))
$attrs['data-redirect-url'] = $option['data-redirect-url'];
}
else
$attrs['href'] = '#';
foreach ($option as $key => $val)
if (strpos($key, 'data-') === 0)
$attrs[$key] = $val;
if (!empty($class))
$attrs['class'] = join(' ', $class);
TextHelper::openHtmlTag('a', $attrs);
echo $option['text'];

2
src/Views/tag-mass-tag.phtml
View file

@ -15,7 +15,7 @@
<div>
<label class="left">&nbsp;</label>
<button type="submit">Tag!</button>
<button class="submit" type="submit">Tag!</button>
</div>
</form>
</div>

2
src/Views/tag-merge.phtml
View file

@ -15,7 +15,7 @@
<div>
<label class="left">&nbsp;</label>
<button type="submit">Merge!</button>
<button class="submit" type="submit">Merge!</button>
</div>
</form>
</div>

2
src/Views/tag-rename.phtml
View file

@ -15,7 +15,7 @@
<div>
<label class="left">&nbsp;</label>
<button type="submit">Rename!</button>
<button class="submit" type="submit">Rename!</button>
</div>
</form>
</div>

4
src/Views/user-delete.phtml
View file

@ -1,4 +1,4 @@
<form action="<?php echo \Chibi\UrlHelper::route('user', 'delete', ['name' => $this->context->transport->user->name]) ?>" method="post" class="delete aligned" autocomplete="off" data-confirm-text="Are you sure you want to delete your account?">
<form action="<?php echo \Chibi\UrlHelper::route('user', 'delete', ['name' => $this->context->transport->user->name]) ?>" method="post" class="delete aligned confirmable" autocomplete="off" data-confirm-text="Are you sure you want to delete your account?">
<?php if ($this->context->user->id == $this->context->transport->user->id): ?>
<div class="current-password">
<label class="left" for="current-password">Current password:</label>
@ -12,6 +12,6 @@
<div>
<label class="left">&nbsp;</label>
<button type="submit">Delete account</button>
<button class="submit" type="submit">Delete account</button>
</div>
</form>

2
src/Views/user-edit.phtml
View file

@ -56,6 +56,6 @@
<div>
<label class="left">&nbsp;</label>
<button type="submit">Submit</button>
<button class="submit" type="submit">Submit</button>
</div>
</form>

2
src/Views/user-registration.phtml
View file

@ -38,7 +38,7 @@
<div>
<label class="left"></label>
<button type="submit">Register</button>
<button class="submit" type="submit">Register</button>
</div>
</form>
<?php endif ?>

2
src/Views/user-select.phtml
View file

@ -15,7 +15,7 @@
<div>
<label class="left">&nbsp;</label>
<button type="submit">Continue</button>
<button class="submit" type="submit">Continue</button>
</div>
</form>
<?php endif ?>

2
src/Views/user-settings.phtml
View file

@ -37,7 +37,7 @@
<div>
<label class="left">&nbsp;</label>
<button type="submit">Update settings</button>
<button class="submit" type="submit">Update settings</button>
</div>
</form>