diff options
| author | Teddy Wing | 2013-11-10 12:21:33 -0500 | 
|---|---|---|
| committer | Teddy Wing | 2013-11-10 12:21:33 -0500 | 
| commit | 2c4c8d1f538d33a37bf4091282a454da74465b06 (patch) | |
| tree | 15a70c621ac9135232cbe70eb2eb84a3205f4415 /assets | |
| parent | d907e2edc62ea2b990c722b9db0af73aecebaa74 (diff) | |
| parent | 50dcbc710a065cef782d9b11bc9d15fea4f0d71b (diff) | |
| download | clip-play-2c4c8d1f538d33a37bf4091282a454da74465b06.tar.bz2 | |
Merge branch 'url-add-enter-key'
Diffstat (limited to 'assets')
| -rw-r--r-- | assets/js/views/sample-add-view.js | 9 | 
1 files changed, 8 insertions, 1 deletions
diff --git a/assets/js/views/sample-add-view.js b/assets/js/views/sample-add-view.js index 8be2fb8..6fea239 100644 --- a/assets/js/views/sample-add-view.js +++ b/assets/js/views/sample-add-view.js @@ -4,7 +4,8 @@ ClipPlay.Views.SampleAddView = Marionette.View.extend({  	url_matcher: /(http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?/,  	events: { -		'click .js-create-sample': 'on_sample_add' +		'click .js-create-sample': 'on_sample_add', +		'submit .js-add-sample-form': 'hijack_form'  	},  	initialize: function(options) { @@ -12,6 +13,12 @@ ClipPlay.Views.SampleAddView = Marionette.View.extend({  		this.$input = this.$('.js-sample-url');  	}, +	hijack_form: function() { +		this.on_sample_add(); +		 +		return false; +	}, +	  	add_sample_to_collection: function() {  		this.collection.add({  			url: this.$input.val()  | 
