From 81f2c983e5e901a7c832b7213595f1bd6443a347 Mon Sep 17 00:00:00 2001 From: "chm@openerp.com" <> Date: Tue, 8 Apr 2014 11:47:03 +0200 Subject: [PATCH] [IMP] website: media editor: change button on keyup bzr revid: chm@openerp.com-20140408094703-7qayghtm88qku3jz --- .../website/static/src/js/website.editor.js | 23 ++++++++++++------- .../website/static/src/xml/website.editor.xml | 15 ++++++------ 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js index b27fd94c091..365b8cf46ea 100644 --- a/addons/website/static/src/js/website.editor.js +++ b/addons/website/static/src/js/website.editor.js @@ -1454,13 +1454,8 @@ }, 'change input[type=file]': 'file_selection', 'submit form': 'form_submit', - 'change input.url': function (e) { - if ($(e.target).val() === "") { - this.$("button").addClass("btn-default").removeClass("btn-primary"); - } else { - this.$("button").removeClass("btn-default").addClass("btn-primary"); - } - }, + 'change input.url': "change_input", + 'keyup input.url': "change_input", //'change select.image-style': 'preview_image', 'click .existing-attachments img': 'select_existing', 'click .existing-attachment-remove': 'try_remove', @@ -1511,6 +1506,16 @@ this.trigger('cancel'); }, + change_input: function (e) { + var $input = $(e.target); + var $button = $input.parent().find("button"); + if ($input.val() === "") { + $button.addClass("btn-default").removeClass("btn-primary"); + } else { + $button.removeClass("btn-default").addClass("btn-primary"); + } + }, + search: function (needle) { var self = this; this.fetch_existing(needle).then(function () { @@ -1861,7 +1866,9 @@ 'click input#urlvideo ~ button': 'get_video', 'click input#embedvideo ~ button': 'get_embed_video', 'change input#urlvideo': 'change_input', - 'change input#embedvideo': 'change_input' + 'keyup input#urlvideo': 'change_input', + 'change input#embedvideo': 'change_input', + 'keyup input#embedvideo': 'change_input' }), start: function () { this.$iframe = this.$("iframe"); diff --git a/addons/website/static/src/xml/website.editor.xml b/addons/website/static/src/xml/website.editor.xml index 0fcbc585ae5..879da3011f6 100644 --- a/addons/website/static/src/xml/website.editor.xml +++ b/addons/website/static/src/xml/website.editor.xml @@ -147,18 +147,19 @@ target="fileframe" class="form-inline">
-
- +
+ + + +
+
+ — or — +
-
- - - -