Minor tweaks and js cleanups

src/Packagist/WebBundle/Controller/WebController.php

@@ -506,7 +506,10 @@ class WebController extends Controller
             $version = $versionRepo->getFullVersion($package->getVersions()->first()->getId());
         }
 
-        $data = array('package' => $package, 'version' => $version);
+        $data = array(
+            'package' => $package,
+            'version' => $version
+        );
 
         try {
             $data['downloads'] = $this->get('packagist.download_manager')->getDownloads($package);
@@ -515,16 +518,11 @@ class WebController extends Controller
                 $data['is_favorite'] = $this->get('packagist.favorite_manager')->isMarked($this->getUser(), $package);
             }
         } catch (ConnectionException $e) {
-            $data['downloads'] = array(
-                'total' => 'N/A',
-                'monthly' => 'N/A',
-                'daily' => 'N/A',
-            );
         }
 
         $data['searchForm'] = $this->createSearchForm()->createView();
         if ($maintainerForm = $this->createAddMaintainerForm($package)) {
-            $data['form'] = $maintainerForm->createView();
+            $data['addMaintainerForm'] = $maintainerForm->createView();
         }
         if ($removeMaintainerForm = $this->createRemoveMaintainerForm($package)) {
             $data['removeMaintainerForm'] = $removeMaintainerForm->createView();
@@ -739,8 +737,8 @@ class WebController extends Controller
 
         $data = array(
             'package' => $package,
-            'form' => $form->createView(),
-            'show_maintainer_form' => true,
+            'addMaintainerForm' => $form->createView(),
+            'show_add_maintainer_form' => true,
         );
 
         if ('POST' === $req->getMethod()) {
@@ -776,7 +774,7 @@ class WebController extends Controller
 
     /**
      * @Template("PackagistWebBundle:Web:viewPackage.html.twig")
-     * @Route("/packages/{name}/remove_maintainers/", name="remove_maintainer", requirements={"name"="[A-Za-z0-9_.-]+/[A-Za-z0-9_.-]+"})
+     * @Route("/packages/{name}/maintainers/delete", name="remove_maintainer", requirements={"name"="[A-Za-z0-9_.-]+/[A-Za-z0-9_.-]+"})
      */
     public function removeMaintainerAction(Request $req, $name)
     {
@@ -794,6 +792,7 @@ class WebController extends Controller
 
         $data = array(
             'package' => $package,
+            'version' => null,
             'removeMaintainerForm' => $removeMaintainerForm->createView(),
             'show_remove_maintainer_form' => true,
         );

src/Packagist/WebBundle/Resources/public/js/view.js

@@ -1,9 +1,13 @@
+/*jslint nomen: true, browser: true*/
 (function ($, humane, ZeroClipboard) {
+    "use strict";
     $('#add-maintainer').click(function (e) {
+        $('#remove-maintainer-form').addClass('hidden');
         $('#add-maintainer-form').toggleClass('hidden');
         e.preventDefault();
     });
     $('#remove-maintainer').click(function (e) {
+        $('#add-maintainer-form').addClass('hidden');
         $('#remove-maintainer-form').toggleClass('hidden');
         e.preventDefault();
     });
@@ -11,7 +15,7 @@
         e.preventDefault();
         $(this).siblings('.details-toggler').click();
     });
-    $('.package .details-toggler').click(function (e) {
+    $('.package .details-toggler').click(function () {
         var target = $(this);
         target.toggleClass('open')
             .prev().toggleClass('open');
@@ -38,7 +42,7 @@
             cache: false,
             data: $(this).serializeArray(),
             type: 'PUT',
-            success: function (data) {
+            success: function () {
                 window.location.href = window.location.href;
             },
             context: this
@@ -49,7 +53,7 @@
         var options = {
             dataType: 'json',
             cache: false,
-            success: function (data) {
+            success: function () {
                 $(this).toggleClass('icon-star icon-star-empty');
             },
             context: this
@@ -71,7 +75,7 @@
     });
     $('.package .delete').submit(function (e) {
         e.preventDefault();
-        if (confirm('Are you sure?')) {
+        if (window.confirm('Are you sure?')) {
             e.target.submit();
         }
     });
@@ -81,11 +85,11 @@
     $('.package .delete-version').submit(function (e) {
         e.preventDefault();
         e.stopImmediatePropagation();
-        if (confirm('Are you sure?')) {
+        if (window.confirm('Are you sure?')) {
             e.target.submit();
         }
     });
-    $('.package').on('click', '.requireme input', function (e) {
+    $('.package').on('click', '.requireme input', function () {
         this.select();
     });
     if ($('.package').data('force-crawl')) {

src/Packagist/WebBundle/Resources/views/Web/viewPackage.html.twig

@@ -9,7 +9,7 @@
 {% endblock %}
 
 {% block scripts %}
-    <script src="{{ asset('bundles/packagistweb/js/view.js?v=12')}}"></script>
+    <script src="{{ asset('bundles/packagistweb/js/view.js?v=13')}}"></script>
 {% endblock %}
 
 {% block content %}
@@ -63,9 +63,9 @@
             {% endif %}
 
             <p class="downloads">
-                <span>Overall:</span> {{ downloads.total }} {% if downloads.total != 'N/A' %}install{{ downloads.total == 1 ? '' : 's' }}{% endif %}<br />
-                <span>This month:</span> {{ downloads.monthly }} {% if downloads.monthly != 'N/A' %}install{{ downloads.monthly == 1 ? '' : 's' }}{% endif %}<br />
-                <span>Today:</span> {{ downloads.daily }} {% if downloads.daily != 'N/A' %}install{{ downloads.daily == 1 ? '' : 's' }}{% endif %}<br />
+                <span>Overall:</span> {% if downloads.total is defined %}{{ downloads.total }} install{{ downloads.total == 1 ? '' : 's' }}{% else %}N/A{% endif %}<br />
+                <span>This month:</span> {% if downloads.monthly is defined %}{{ downloads.monthly }} install{{ downloads.monthly == 1 ? '' : 's' }}{% else %}N/A{% endif %}<br />
+                <span>Today:</span> {% if downloads.daily is defined %}{{ downloads.daily }} install{{ downloads.daily == 1 ? '' : 's' }}{% else %}N/A{% endif %}<br />
             </p>
 
             <p class="description">{{ package.description }}</p>
@@ -74,7 +74,7 @@
                 {% for maintainer in package.maintainers %}
                     <a href="{{ path('user_profile', {'name': maintainer.username}) }}">{{ maintainer.username }}</a>{{ loop.last ? '' : ', ' }}
                 {% endfor %}
-                {% if form is defined or removeMaintainerForm is defined %}({% if form is defined %}<a id="add-maintainer" href="{{ path('add_maintainer', {'name': package.name}) }}">add maintainer</a>{% endif %}{% if form is defined and removeMaintainerForm is defined %} / {% endif %}{% if removeMaintainerForm is defined %}<a id="remove-maintainer" href="{{ path('remove_maintainer', {'name': package.name}) }}">remove maintainer</a>{% endif %}){% endif %}
+                {% if addMaintainerForm is defined or removeMaintainerForm is defined %}({% if addMaintainerForm is defined %}<a id="add-maintainer" href="{{ path('add_maintainer', {'name': package.name}) }}">add maintainer</a>{% endif %}{% if addMaintainerForm is defined and removeMaintainerForm is defined %} / {% endif %}{% if removeMaintainerForm is defined %}<a id="remove-maintainer" href="{{ path('remove_maintainer', {'name': package.name}) }}">remove maintainer</a>{% endif %}){% endif %}
                 <br />
                 {% if version and version.homepage %}
                     <span>Homepage:</span> <a href="{{ version.homepage }}">{{ version.homepage|replace({'http://': ''}) }}</a><br />
@@ -98,18 +98,18 @@
                 {% endif %}
             </p>
 
-            {% if form is defined or removeMaintainerForm is defined %}
+            {% if addMaintainerForm is defined or removeMaintainerForm is defined %}
                 <div>
-                    {% if form is defined %}
-                        <form id="add-maintainer-form" class="{{ show_maintainer_form|default(false) ? '': 'hidden' }}" action="{{ path('add_maintainer', {'name': package.name}) }}" method="POST" {{ form_enctype(form) }}>
+                    {% if addMaintainerForm is defined %}
+                        <form id="add-maintainer-form" class="{{ show_add_maintainer_form|default(false) ? '': 'hidden' }}" action="{{ path('add_maintainer', {'name': package.name}) }}" method="POST" {{ form_enctype(addMaintainerForm) }}>
                             <div>
                                 <h2>Add Maintainer</h2>
                                 <p>
-                                    {{ form_label(form.user, "Username") }}
-                                    {{ form_errors(form.user) }}
-                                    {{ form_widget(form.user) }}
+                                    {{ form_label(addMaintainerForm.user, "Username") }}
+                                    {{ form_errors(addMaintainerForm.user) }}
+                                    {{ form_widget(addMaintainerForm.user) }}
                                 </p>
-                                {{ form_rest(form) }}
+                                {{ form_rest(addMaintainerForm) }}
                                 <input id="submit" type="submit" value="Submit" />
                             </div>
                         </form>