diff --git a/_working/create b/_working/create
old mode 100755
new mode 100644
diff --git a/manage.py b/manage.py
old mode 100755
new mode 100644
diff --git a/static/bin/sm/soundmanager2.swf b/static/bin/sm/soundmanager2.swf
old mode 100755
new mode 100644
diff --git a/static/bin/sm/soundmanager2_debug.swf b/static/bin/sm/soundmanager2_debug.swf
old mode 100755
new mode 100644
diff --git a/static/bin/sm/soundmanager2_flash9.swf b/static/bin/sm/soundmanager2_flash9.swf
old mode 100755
new mode 100644
diff --git a/static/bin/sm/soundmanager2_flash9_debug.swf b/static/bin/sm/soundmanager2_flash9_debug.swf
old mode 100755
new mode 100644
diff --git a/static/bin/sm/soundmanager2_flash_xdomain.zip b/static/bin/sm/soundmanager2_flash_xdomain.zip
old mode 100755
new mode 100644
diff --git a/static/js/app/views/event.js b/static/js/app/views/event.js
index a54773b..e2c4707 100644
--- a/static/js/app/views/event.js
+++ b/static/js/app/views/event.js
@@ -62,7 +62,9 @@ var EventView = Backbone.View.extend({
});
var EventCreateView = DSSEditableView.extend({
events:{
- "click #save-changes":"saveChanges"
+ "click #save-changes":"saveChanges",
+ "change input":"changed",
+ "change textarea":"changed"
},
initialize:function () {
this.render();
diff --git a/static/js/app/views/mix.js b/static/js/app/views/mix.js
index 143cf15..2aebc1a 100644
--- a/static/js/app/views/mix.js
+++ b/static/js/app/views/mix.js
@@ -126,12 +126,12 @@ window.MixView = Backbone.View.extend({
}
});
-window.MixCreateView = Backbone.View.extend({
+window.MixCreateView = DSSEditableView.extend({
events:{
"click #save-changes":"saveChanges",
+ "change #mix_image":"imageChanged",
"change input":"changed",
- "change textarea":"changed",
- "change #mix_image":"imageChanged"
+ "change textarea":"changed"
},
checkRedirect:function () {
if (this.state == 2) {
@@ -227,13 +227,6 @@ window.MixCreateView = Backbone.View.extend({
});
return false;
},
- changed:function (evt) {
- var changed = evt.currentTarget;
- var value = $("#" + changed.id).val();
- var obj = "{\"" + changed.id + "\":\"" + value + "\"}";
- var objInst = JSON.parse(obj);
- this.model.set(objInst);
- },
imageChanged:function (evt) {
this.sendImage = true;
}
diff --git a/static/js/libs/backbone/backbone.mine.js b/static/js/libs/backbone/backbone.mine.js
index 4c0d89d..5def668 100644
--- a/static/js/libs/backbone/backbone.mine.js
+++ b/static/js/libs/backbone/backbone.mine.js
@@ -64,7 +64,7 @@ window.DSSEditableView = Backbone.View.extend({
changed:function (evt) {
var changed = evt.currentTarget;
var value = $("#" + changed.id).val();
- var obj = "{\"" + changed.id + "\":\"" + value + "\"}";
+ var obj = "{\"" + changed.id + "\":\"" + value.replace(/\n/g, '
') + "\"}";
var objInst = JSON.parse(obj);
this.model.set(objInst);
},
diff --git a/templates/inc/_MixItemInsert.html b/templates/inc/_MixItemInsert.html
index 7d04851..a3ae3fe 100644
--- a/templates/inc/_MixItemInsert.html
+++ b/templates/inc/_MixItemInsert.html
@@ -62,9 +62,11 @@
-