From ea6e11000db87b0754518228fb8226c3448a1179 Mon Sep 17 00:00:00 2001
From: Anthony Lapenna <lapenna.anthony@gmail.com>
Date: Wed, 10 Aug 2016 15:27:03 +1200
Subject: [PATCH 1/2] fix(images): display an error message when unable to
 remove an image (#114)

---
 app/components/images/imagesController.js | 16 +++++++++-------
 gruntFile.js                              |  4 ++--
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/app/components/images/imagesController.js b/app/components/images/imagesController.js
index ee824fcbc..5fd1b9e21 100644
--- a/app/components/images/imagesController.js
+++ b/app/components/images/imagesController.js
@@ -71,15 +71,17 @@ function ($scope, $state, Image, Messages) {
       if (i.Checked) {
         counter = counter + 1;
         Image.remove({id: i.Id}, function (d) {
-          angular.forEach(d, function (resource) {
-            Messages.send("Image deleted", resource.Deleted);
-          });
-          var index = $scope.images.indexOf(i);
-          $scope.images.splice(index, 1);
+          if (d[0].message) {
+            $('#loadingViewSpinner').hide();
+            Messages.error("Unable to remove image", d[0].message);
+          } else {
+            Messages.send("Image deleted", i.Id);
+            var index = $scope.images.indexOf(i);
+            $scope.images.splice(index, 1);
+          }
           complete();
         }, function (e) {
-          Messages.error("Failure", e.data);
-          $('#loadImagesSpinner').hide();
+          Messages.error("Unable to remove image", e.data);
           complete();
         });
       }
diff --git a/gruntFile.js b/gruntFile.js
index 86c2f3ebe..4af600813 100644
--- a/gruntFile.js
+++ b/gruntFile.js
@@ -152,11 +152,11 @@ module.exports = function (grunt) {
                 }
             },
             angular: {
-                src: ['bower_components/angular/angular.min.js',
+                src: ['bower_components/angular/angular.js',
                     'bower_components/angular-sanitize/angular-sanitize.min.js',
                     'bower_components/angular-cookies/angular-cookies.min.js',
                     'bower_components/angular-ui-router/release/angular-ui-router.min.js',
-                    'bower_components/angular-resource/angular-resource.min.js',
+                    'bower_components/angular-resource/angular-resource.js',
                     'bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js',
                     'bower_components/angular-ui-select/dist/select.min.js'],
                 dest: '<%= distdir %>/js/angular.js'

From 87798cd1c8e217692c2ea2f246f93634e4f938a5 Mon Sep 17 00:00:00 2001
From: Anthony Lapenna <lapenna.anthony@gmail.com>
Date: Wed, 10 Aug 2016 15:31:58 +1200
Subject: [PATCH 2/2] chore(gruntfile): revert commit to use minified libraries

---
 app/shared/services.js | 4 ++--
 gruntFile.js           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/shared/services.js b/app/shared/services.js
index c320812ac..7a323ba9e 100644
--- a/app/shared/services.js
+++ b/app/shared/services.js
@@ -98,7 +98,7 @@ angular.module('uifordocker.services', ['ngResource', 'ngSanitize'])
             inspect: {method: 'GET', params: {id: '@id', action: 'json'}},
             create: {
                 method: 'POST', params: {action: 'create', fromImage: '@fromImage', tag: '@tag'},
-                isArray: true, transformResponse: createImageHandler,
+                isArray: true, transformResponse: createImageHandler
             },
             remove: {
               method: 'DELETE', params: {id: '@id'},
@@ -112,7 +112,7 @@ angular.module('uifordocker.services', ['ngResource', 'ngSanitize'])
         return $resource(Settings.url + '/events', {}, {
             query: {
               method: 'GET', params: {since: '@since', until: '@until'},
-              isArray: true, transformResponse: queryEventsHandler,
+              isArray: true, transformResponse: queryEventsHandler
             }
         });
     }])
diff --git a/gruntFile.js b/gruntFile.js
index 4af600813..86c2f3ebe 100644
--- a/gruntFile.js
+++ b/gruntFile.js
@@ -152,11 +152,11 @@ module.exports = function (grunt) {
                 }
             },
             angular: {
-                src: ['bower_components/angular/angular.js',
+                src: ['bower_components/angular/angular.min.js',
                     'bower_components/angular-sanitize/angular-sanitize.min.js',
                     'bower_components/angular-cookies/angular-cookies.min.js',
                     'bower_components/angular-ui-router/release/angular-ui-router.min.js',
-                    'bower_components/angular-resource/angular-resource.js',
+                    'bower_components/angular-resource/angular-resource.min.js',
                     'bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js',
                     'bower_components/angular-ui-select/dist/select.min.js'],
                 dest: '<%= distdir %>/js/angular.js'