bastion 3.2.2 → 3.3.0

data/vendor/assets/javascripts/bastion/ngUpload/ng-upload.js

@@ -6,11 +6,11 @@
 //
 // <div ng-app="app">
 //   <div ng-controller="mainCtrl">
-//    <form ng-attr-action="/uploads"
-//      ng-upload="completed(content)">
+//    <form ng-attr-action="/uploads" 
+//      ng-upload="completed(content)"> 
 //      ng-upload-loading="loading()"
 //      <input type="file" name="avatar"></input>
-//      <input type="submit" value="Upload"
+//      <input type="submit" value="Upload" 
 //         ng-disabled="$isUploading"></input>
 //    </form>
 //  </div>
@@ -92,7 +92,8 @@ angular.module('ngUpload', [])
         //    // add the Rails CSRF hidden input to form
         //    enableRailsCsrf: bool
         // }
-        var fn = attrs.ngUpload ? $parse(attrs.ngUpload) : angular.noop;
+        var fn = attrs.ngUpload ? $parse(attrs.ngUpload) : null;
+        var errorCatcher = attrs.errorCatcher ? $parse(attrs.errorCatcher) : null;
         var loading = attrs.ngUploadLoading ? $parse(attrs.ngUploadLoading) : null;
 
         if ( attrs.hasOwnProperty( "uploadOptionsConvertHidden" ) ) {
@@ -136,12 +137,21 @@ angular.module('ngUpload', [])
 
         setLoadingState(false);
         // Start upload
-        element.bind('submit', function uploadStart() {
+        element.bind('submit', function uploadStart($event) {
           var formController = scope[attrs.name];
           // if form is invalid don't submit (e.g. keypress 13)
-          if(formController && formController.$invalid) return false;
+          if(formController && formController.$invalid) {
+            $event.preventDefault();
+            return false;
+          }
           // perform check before submit file
-          if (options.beforeSubmit && options.beforeSubmit(scope, {}) == false) return false;
+          if (options.beforeSubmit && options.beforeSubmit(scope, {}) === false) {
+            if(!scope.$$phase){
+              scope.$apply();
+            }
+            $event.preventDefault();
+            return false;
+          }
 
           // bind load after submit to prevent initial load triggering uploadEnd
           iframe.bind('load', uploadEnd);
@@ -181,24 +191,53 @@ angular.module('ngUpload', [])
             setLoadingState(false);
           }
           // Get iframe body contents
-          var bodyContent = (iframe[0].contentDocument ||
-            iframe[0].contentWindow.document).body;
-          var content;
           try {
-            content = angular.fromJson(bodyContent.innerText || bodyContent.textContent);
-          } catch (e) {
-            // Fall back to html if json parse failed
-            content = bodyContent.innerHTML;
-            $log.warn('Response is not valid JSON');
-          }
-          // if outside a digest cycle, execute the upload response function in the active scope
-          // else execute the upload response function in the current digest
-          if (!scope.$$phase) {
-             scope.$apply(function () {
-                 fn(scope, { content: content});
-             });
-          } else {
-            fn(scope, { content: content});
+              var bodyContent = (iframe[0].contentDocument ||
+                iframe[0].contentWindow.document).body;
+
+              var content;
+              try {
+                content = angular.fromJson(bodyContent.innerText || bodyContent.textContent);
+                if (!scope.$$phase) {
+                   scope.$apply(function () {
+                       fn(scope, { content: content});
+                   });
+                } else {
+                  fn(scope, { content: content});
+                }
+              } catch (e) {
+                // Fall back to html if json parse failed
+                content = bodyContent.innerHTML;
+                var error = 'ng-upload: Response is not valid JSON';
+                $log.warn(error);
+
+                if ( errorCatcher ){
+                   if (!scope.$$phase) {
+                      scope.$apply(function () {
+                          errorCatcher(scope, { error: error});
+                      });
+                   } else {
+                     errorCatcher(scope, { error: error});
+                   }
+                }
+
+              }
+              // if outside a digest cycle, execute the upload response function in the active scope
+              // else execute the upload response function in the current digest
+
+          } catch (error) {
+            $log.warn('ng-upload: Server error');
+
+            if ( errorCatcher ){
+               if (!scope.$$phase) {
+                  scope.$apply(function () {
+                      errorCatcher(scope, { error: error});
+                  });
+               } else {
+                 errorCatcher(scope, { error: error});
+               }
+            }
+
           }
         }
       }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bastion
 version: !ruby/object:Gem::Version
-  version: 3.2.2
+  version: 3.3.0
 platform: ruby
 authors:
 - Eric D Helms
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-27 00:00:00.000000000 Z
+date: 2016-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: angular-rails-templates
@@ -140,6 +140,7 @@ files:
 - app/assets/javascripts/bastion/i18n/zanata.xml
 - app/assets/javascripts/bastion/layouts/details-nutupane.html
 - app/assets/javascripts/bastion/layouts/nutupane.html
+- app/assets/javascripts/bastion/layouts/panel.html
 - app/assets/javascripts/bastion/layouts/select-all-results.html
 - app/assets/javascripts/bastion/menu/menu-expander.service.js
 - app/assets/javascripts/bastion/menu/menu.module.js