filedrop enter press #156

blackbaud · Dec 15, 2015 · a463081 · a463081
1 parent 622d889
commit a463081
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 3 deletions.
diff --git a/js/sky/src/fileattachments/filedrop.js b/js/sky/src/fileattachments/filedrop.js
@@ -19,7 +19,8 @@
                 scope.bbFileDrop = {
                     hasTranscludeContents: $.trim(el.find('.bb-file-drop-contents-custom').html()).length > 0,
                     allowLinks: angular.isDefined(attrs.bbFileDropLink),
-                    addLink: function () {
+                    addLink: function ($event) {
+                        $event.preventDefault();
                         scope.bbFileDropLinkChange({
                             link: {
                                 url: scope.bbFileDrop.url

diff --git a/js/sky/src/fileattachments/test/filedrop.spec.js b/js/sky/src/fileattachments/test/filedrop.spec.js
@@ -429,4 +429,28 @@ describe('File drop directive', function () {
         el.remove();
         nonTargetEl.remove();
     });
+
+    it('should call event prevent default on enter', function () {
+        var $scope = $rootScope.$new(),
+            el,
+            $event,
+            isolateScope;
+
+        $event = jasmine.createSpyObj('$event', ['preventDefault']);
+
+        $scope.addLink = angular.noop;
+
+        el = getDropWithLinkEl($scope);
+
+        // The element has to be in the DOM to trigger its change event in Firefox.
+        el.appendTo(document.body);
+
+        isolateScope = el.isolateScope();
+
+        isolateScope.bbFileDrop.addLink($event);
+
+        expect($event.preventDefault).toHaveBeenCalled();
+
+        el.remove();
+    });
 });
diff --git a/js/sky/templates/fileattachments/filedrop.html b/js/sky/templates/fileattachments/filedrop.html
@@ -35,10 +35,10 @@ <h4 class="bb-file-drop-link-header">{{'file_upload_paste_link' | bbResources}}<
                            class="form-control"
                            placeholder="{{'file_upload_link_placeholder' | bbResources}}"
                            ng-model="bbFileDrop.url"
-                           ng-keypress="$event.keyCode === 13 && bbFileDrop.addLink()"
+                           ng-keypress="$event.keyCode === 13 && bbFileDrop.addLink($event)"
                            />
                 </div>
-                <button type="button" class="btn btn-primary" ng-disabled="!bbFileDrop.url" ng-click="bbFileDrop.addLink()">
+                <button type="button" class="btn btn-primary" ng-disabled="!bbFileDrop.url" ng-click="bbFileDrop.addLink($event)">
                     {{'file_upload_paste_link_done' | bbResources}}
                 </button>
             </div>