From e61d24f685d265f6c3c2f200b285a7cf4ffe4e04 Mon Sep 17 00:00:00 2001 From: Nick Peelman Date: Mon, 18 Jul 2016 09:08:48 -0400 Subject: [PATCH] Fixing indentation problems... --- app/Presenters/ComponentGroupPresenter.php | 4 +- resources/assets/js/app.js | 10 +--- .../views/partials/component_input.blade.php | 29 +++++----- .../views/partials/components_form.blade.php | 56 +++++++++---------- 4 files changed, 47 insertions(+), 52 deletions(-) diff --git a/app/Presenters/ComponentGroupPresenter.php b/app/Presenters/ComponentGroupPresenter.php index 91967f5e..1cd9e9ab 100644 --- a/app/Presenters/ComponentGroupPresenter.php +++ b/app/Presenters/ComponentGroupPresenter.php @@ -105,8 +105,8 @@ class ComponentGroupPresenter extends BasePresenter implements Arrayable */ public function has_subscriber($subscriptions) { - $enabled_components = $this->wrappedObject->enabled_components()->orderBy('order')->pluck('id')->toArray(); - $intersected = array_intersect($enabled_components, $subscriptions); + $enabled_components = $this->wrappedObject->enabled_components()->orderBy('order')->pluck('id')->toArray(); + $intersected = array_intersect($enabled_components, $subscriptions); return count($intersected) != 0; } diff --git a/resources/assets/js/app.js b/resources/assets/js/app.js index 6511596e..4ac6dc4d 100644 --- a/resources/assets/js/app.js +++ b/resources/assets/js/app.js @@ -278,21 +278,17 @@ $(function() { }); $('.select-group').on('click', function () { - var $this = $(this); - var $parentGroup = $this.closest('ul.list-group'); + var $parentGroup = $(this).closest('ul.list-group'); $parentGroup.find('input[type=checkbox]').prop('checked', true); - $parentGroup.find('.group-items').removeClass('hide') $parentGroup.find('.group-toggle').addClass('ion-ios-minus-outline').removeClass('ion-ios-plus-outline'); - event.stopPropagation(); + event.stopPropagation(); return false; }); $('.deselect-group').on('click', function () { - var $this = $(this); - var $parentGroup = $this.closest('ul.list-group'); + var $parentGroup = $(this).closest('ul.list-group'); $parentGroup.find('input[type=checkbox]').prop('checked', false); - $parentGroup.find('.group-items').addClass('hide'); $parentGroup.find('.group-toggle').removeClass('ion-ios-minus-outline').addClass('ion-ios-plus-outline'); event.stopPropagation(); diff --git a/resources/views/partials/component_input.blade.php b/resources/views/partials/component_input.blade.php index abbc5f76..599d525e 100644 --- a/resources/views/partials/component_input.blade.php +++ b/resources/views/partials/component_input.blade.php @@ -1,18 +1,17 @@
  • -
    - -
    - @if($component->description) +
    + +
    + @if($component->description) - @endif - + @endif
  • diff --git a/resources/views/partials/components_form.blade.php b/resources/views/partials/components_form.blade.php index 5e31c33d..876891e2 100644 --- a/resources/views/partials/components_form.blade.php +++ b/resources/views/partials/components_form.blade.php @@ -1,33 +1,33 @@ @if($component_groups->count() > 0) -@foreach($component_groups as $componentGroup) - -@endforeach + @foreach($component_groups as $componentGroup) + + @endforeach @endif @if($ungrouped_components->count() > 0) - + @endif