Mercurial > hg > soundsoftware-site
changeset 794:eebd5b1f5eb0 feature_14
Fixes Bug #341.
author | luisf <luis.figueira@eecs.qmul.ac.uk> |
---|---|
date | Mon, 21 Nov 2011 15:57:33 +0000 |
parents | c2357075c5c9 |
children | 22358e72a390 |
files | vendor/plugins/redmine_tags/assets/javascripts/projects_index.js vendor/plugins/redmine_tags/assets/javascripts/tags_input.js |
diffstat | 2 files changed, 33 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/vendor/plugins/redmine_tags/assets/javascripts/projects_index.js Fri Nov 18 17:14:46 2011 +0000 +++ b/vendor/plugins/redmine_tags/assets/javascripts/projects_index.js Mon Nov 21 15:57:33 2011 +0000 @@ -5,8 +5,13 @@ change_session(id, status); toggleFieldset(this_field); + }; + function submitForm(){ + $('submitButton').click(); + }; + function change_session(id, nstatus) { var url = "projects/set_fieldset_status"; var request = new Ajax.Request(url, { @@ -16,20 +21,16 @@ }); } -function submitForm(){ - $('submitButton').click(); return false; -} - function keypressHandler (event){ - var key = event.which || event.keyCode; - switch (key) { - default: - break; - case Event.KEY_RETURN: - $('submitButton').click(); return false; - break; - } -} + var key = event.which || event.keyCode; + switch (key) { + default: + break; + case Event.KEY_RETURN: + $('submitButton').click(); return false; + break; + }; +}; document.observe("dom:loaded", function() { $('search-input').observe('keypress', keypressHandler);
--- a/vendor/plugins/redmine_tags/assets/javascripts/tags_input.js Fri Nov 18 17:14:46 2011 +0000 +++ b/vendor/plugins/redmine_tags/assets/javascripts/tags_input.js Mon Nov 21 15:57:33 2011 +0000 @@ -28,7 +28,12 @@ this.tags = new Hash(); this.update = update; - + + var uri_params = window.location.href.toQueryParams(); + if (uri_params["project[tag_list]"] != undefined){ + this.addTag(uri_params["project[tag_list]"], true); + }; + Event.observe(this.button, 'click', this.readTags.bind(this)); Event.observe(this.input, 'keypress', this.onKeyPress.bindAsEventListener(this)); @@ -40,7 +45,9 @@ readTags: function() { this.addTagsList(this.input.value); this.input.value = ''; - if(this.update){submitForm();}; + if(this.update){ + submitForm(); + }; }, onKeyPress: function(event) { @@ -50,9 +57,11 @@ } }, - addTag: function(tag) { + addTag: function(tag, noSubmit) { if (tag.blank() || this.tags.get(tag)) return; + if(noSubmit==undefined){noSubmit=false;} + var button = new Element('span', { 'class': 'tag-delete icon icon-del' }); var label = new Element('span', { 'class': 'tag-label' }).insert(tag).insert(button); @@ -60,7 +69,13 @@ this.element.value = this.getTagsList(); this.element.insert({ 'before': label }); - if(this.update){submitForm();}; + if(noSubmit==false){ + if(this.update){ + console.log('It is true??'); + console.log(this.update); + submitForm(); + }; + }; Event.observe(button, 'click', function(){ this.tags.unset(tag);