From b4230ac8d3780be3fa13bde6c8a699fdff357e61 Mon Sep 17 00:00:00 2001
From: antonmolodykh <antonmolodykh96@gmail.com>
Date: Sat, 1 Jul 2017 11:34:26 +0600
Subject: [PATCH] Fix submit form

---
 static/js/screenly-ose.coffee | 6 ++----
 static/js/screenly-ose.js     | 6 ++----
 views/index.haml              | 2 +-
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/static/js/screenly-ose.coffee b/static/js/screenly-ose.coffee
index 1b098b54..ccfa90c3 100644
--- a/static/js/screenly-ose.coffee
+++ b/static/js/screenly-ose.coffee
@@ -147,14 +147,13 @@ API.View.AddAssetView = class AddAssetView extends Backbone.View
 
   events:
     'change': 'change'
-    'submit form': 'save'
+    'click #save-asset': 'save'
     'click .cancel': 'cancel'
     'hidden.bs.modal': 'destroyFileUploadWidget'
     'click .tabnav-uri': 'clickTabNavUri'
     'click .tabnav-file_upload': 'clickTabNavUpload'
 
   save: (e) =>
-    e.preventDefault()
     if ((@$fv 'uri') == '')
       return no
     if (@$ '#tab-uri').hasClass 'active'
@@ -331,14 +330,13 @@ API.View.EditAssetView = class EditAssetView extends Backbone.View
       @model.set field, (@$fv field), silent:yes
 
   events:
-    'submit form': 'save'
+    'click #save-asset': 'save'
     'click .cancel': 'cancel'
     'change': 'change'
     'keyup': 'change'
     'click .advanced-toggle': 'toggleAdvanced'
 
   save: (e) =>
-    e.preventDefault()
     @viewmodel()
     save = null
     @model.set 'nocache', if (@$ 'input[name="nocache"]').prop 'checked' then 1 else 0
diff --git a/static/js/screenly-ose.js b/static/js/screenly-ose.js
index ace6b309..5aa77538 100644
--- a/static/js/screenly-ose.js
+++ b/static/js/screenly-ose.js
@@ -285,7 +285,7 @@
 
     AddAssetView.prototype.events = {
       'change': 'change',
-      'submit form': 'save',
+      'click #save-asset': 'save',
       'click .cancel': 'cancel',
       'hidden.bs.modal': 'destroyFileUploadWidget',
       'click .tabnav-uri': 'clickTabNavUri',
@@ -294,7 +294,6 @@
 
     AddAssetView.prototype.save = function(e) {
       var model, save;
-      e.preventDefault();
       if ((this.$fv('uri')) === '') {
         return false;
       }
@@ -603,7 +602,7 @@
     };
 
     EditAssetView.prototype.events = {
-      'submit form': 'save',
+      'click #save-asset': 'save',
       'click .cancel': 'cancel',
       'change': 'change',
       'keyup': 'change',
@@ -612,7 +611,6 @@
 
     EditAssetView.prototype.save = function(e) {
       var save;
-      e.preventDefault();
       this.viewmodel();
       save = null;
       this.model.set('nocache', (this.$('input[name="nocache"]')).prop('checked') ? 1 : 0);
diff --git a/views/index.haml b/views/index.haml
index ae3f3db4..290ed420 100644
--- a/views/index.haml
+++ b/views/index.haml
@@ -197,7 +197,7 @@
             .pull-left.progress.progress-striped.active(style="display:none")
               .bar
             %input.btn.cancel(type="button", value="Cancel")
-            %input.btn.btn-primary(id="save-asset", type="submit", value="Save", form="add-form")
+            %input.btn.btn-primary(id="save-asset", type="submit", value="Save")
 
     %script(type="text/template", id="subscribe-form-template")
       %div#subscribe-popover.popover.top(style="display:block")