From c5496e57bad43ef7bfb1f422606611536c4876bb Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 18 Nov 2013 17:43:01 +0100
Subject: [FIX] website snippet: banner editor and remove slide method

bzr revid: chm@openerp.com-20131118164301-v83knbdib3iirftb
---
 .../static/src/js/website.snippets.editor.js       | 29 ++++++++++++++--------
 1 file changed, 19 insertions(+), 10 deletions(-)

(limited to 'addons/website/static/src/js/website.snippets.editor.js')

diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index 07979bfe696..2523c53231f 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -1063,13 +1063,14 @@
         on_add: function (e) {
             e.preventDefault();
             var cycle = this.$inner.find('.item').length;
-            var $active = this.$inner.find('.item.active');
+            var $active = this.$inner.find('.item.active, .item.prev, .item.next').first();
             var index = $active.index();
             this.$target.find('.carousel-control, .carousel-indicators').removeClass("hidden");
             this.$indicators.append('<li data-target="#' + this.id + '" data-slide-to="' + cycle + '"></li>');
 
             var $clone = this.$el.find(".item.active").clone();
-            var bg = this.$editor.find('ul[name="carousel-background"] li:not([data-value="'+ $active.css("background-image").replace(/.*:\/\/[^\/]+|\)$/g, '') +'"]):first').data("value");
+            var avtive_bg = $active.css("background-image").replace(/.*:\/\/[^\/]+|\)$/g, '');
+            var bg = this.$editor.find('ul[name="carousel-background"] li:not([data-value="'+ avtive_bg +'"]):first').data("value");
             $clone.css("background-image", "url('"+ bg +"')");
             $clone.removeClass('active').insertAfter($active);
             this.$target.carousel().carousel(++index);
@@ -1077,21 +1078,29 @@
         },
         on_remove: function (e) {
             e.preventDefault();
+            if (this.remove_process) {
+                return;
+            }
             var self = this;
             var new_index = 0;
             var cycle = this.$inner.find('.item').length - 1;
             var index = this.$inner.find('.item.active').index();
+            
             if (cycle > 0) {
-                this.$inner.find('.item.active').fadeOut(1000, function () {
-                    $(this).remove();
-                    self.$indicators.find('[data-target]:last').remove();
-                    self.$indicators.find("[data-slide-to]").removeClass("active");
-                    self.$indicators.find("[data-slide-to='" + new_index + "']").addClass("active");
+                this.remove_process = true;
+                var $el = this.$inner.find('.item.active');
+                self.$target.on('slid.bs.carousel', function (event) {
+                    $el.remove();
+                    self.$indicators.find("li:last").remove();
+                    self.$target.off('slid.bs.carousel');
+                    self.rebind_event();
+                    self.remove_process = false;
+                    if (cycle == 1) {
+                        self.on_remove(e);
+                    }
                 });
                 setTimeout(function () {
-                    new_index = index % cycle;
-                    self.$target.carousel().carousel( new_index + 1 );
-                    self.rebind_event();
+                    self.$target.carousel( index > 0 ? --index : cycle );
                 }, 500);
             } else {
                 this.$target.find('.carousel-control, .carousel-indicators').addClass("hidden");
-- 
cgit v1.2.3


From 6b10be15b245e05adac2a54f0321305c6d5076d9 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 20 Nov 2013 12:52:50 +0100
Subject: [IMP] website snippet: add group for styles snippets, add custom
 picture with style snippet, mouseover and mouseout preview, fix dark css
 class in demo data

bzr revid: chm@openerp.com-20131120115250-etqv5ofqguze0zsj
---
 .../static/src/js/website.snippets.editor.js       | 130 ++++++++++++++++-----
 1 file changed, 104 insertions(+), 26 deletions(-)

(limited to 'addons/website/static/src/js/website.snippets.editor.js')

diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index 2523c53231f..7d7aade081f 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -151,11 +151,12 @@
                         self.style_templates[snipped_id] = {
                             'snipped-id' : snipped_id,
                             'selector': $style.data('selector'),
-                            'class': $style.find(".oe_snippet_class").text(),
-                            'label': $style.find(".oe_snippet_label").text()
+                            'class': $style.data("class"),
+                            'label': $style.find(".oe_snippet_label").text(),
+                            'group': $style.find(".oe_snippet_group").text()
                         };
                     });
-                    $styles.remove();
+                    $styles.addClass("hidden");
 
                     self.$snippets = $html.find(".tab-content > div > div").addClass("oe_snippet");
                     self.$el.append($html);
@@ -530,11 +531,11 @@
 
     website.snippet.editorRegistry = {};
     website.snippet.Editor = openerp.Class.extend({
-        init: function (parent, dom) {
+        init: function (parent, dom, force_snippet_id) {
             this.parent = parent;
             this.$target = $(dom);
             this.$overlay = this.$target.data('overlay');
-            this.snippet_id = this.$target.data("snippet-id");
+            this.snippet_id = force_snippet_id || this.$target.data("snippet-id");
             this._readXMLData();
             this.load_style_options();
             this.get_parent_block();
@@ -651,6 +652,10 @@
         },
 
         load_style_options: function () {
+            if (this.$target.data('snippetStyles')) {
+                return;
+            }
+
             var self = this;
             var $styles = this.$overlay.find('.oe_options');
             var $ul = $styles.find('ul:first');
@@ -660,30 +665,77 @@
                 }
                 var $li = $("<li class='oe_style'/>").data(val);
                 $li.append($('<a/>').text(val.label));
-                $ul.append($li);
-                if (self.$target.hasClass( "oe_snippet_" + $li.data("snipped-id") )) {
+                if (self.$target.hasClass( val.class )) {
                     $li.addClass("active");
                 }
-                $styles.removeClass("hidden");
+
+                if (val.group.length) {
+                    var $group = $ul.find("li.dropdown-submenu").filter(function () {
+                        return $("a:first", this).text() === val.group;
+                    });
+                    if (!$group.length) {
+                        $group = $('<li class="dropdown-submenu"><a href="#" tabindex="-1"/><ul class="dropdown-menu"/></li>');
+                        $group.find("a").text(val.group);
+                        $ul.append($group);
+                    }
+                    $group.find("ul").append($li);
+                } else {
+                    $ul.append($li);
+                }
             });
-            $styles.on('click', 'li.oe_style a', _.bind(this.change_style, this));
-        },
-        change_style: function (event) {
-            var $li = $(event.currentTarget).parent();
-            var snipped_id = $li.data("snipped-id");
-            var active = $li.hasClass("active");
-
-            if (website.snippet.editorRegistry[snipped_id]) {
-                var snippet = new website.snippet.editorRegistry[snipped_id](this, this.$target);
-                snippet.drop_and_build_snippet(this.$target);
-            }
-            var _class = "oe_snippet_" + snipped_id + " " + ($li.data("class") || "");
-            if (active) {
-                this.$target.removeClass(_class);
-            } else {
-                this.$target.addClass(_class);
+            
+            if ($ul.find("li").length) {
+                $styles.removeClass("hidden");
+                // il they are only one group, display in flat mode
+                var $groups = $ul.find("li.dropdown-submenu");
+                if ($groups.length === 1) {
+                    $ul.append($groups.find("ul li"));
+                    $groups.remove();
+                }
             }
-            $li.toggleClass("active");
+
+            this.$target.data('snippetStyles', $styles);
+            this.change_style();
+        },
+        change_style: function () {
+            var self = this;
+
+            this.$overlay.find('.oe_options li.oe_style a')
+                .on('click', function (event) {
+                    var $li = $(event.currentTarget).parent();
+                    var active = $li.hasClass("active");
+
+                    if ($li.hasClass("active")) {
+                        self.$target.removeClass($li.data('class'));
+                    } else {
+                        var $prev = $li.parent("ul").find("li.active").removeClass("active");
+                        if ($prev.length) {
+                            self.$target.removeClass($prev.data('class'));
+                            // active snippet after remove class
+                            if (website.snippet.editorRegistry[$prev.data("snipped-id")]) {
+                                new website.snippet.editorRegistry[$prev.data("snipped-id")](self.parent, self.$target, $prev.data("snipped-id"))
+                                    .drop_and_build_snippet(self.$target);
+                            }
+                        }
+                        self.$target.addClass($li.data('class'));
+                    }
+
+                    // active snippet after add or remove class
+                    if (website.snippet.editorRegistry[$li.data("snipped-id")]) {
+                        new website.snippet.editorRegistry[$li.data("snipped-id")](self.parent, self.$target, $li.data("snipped-id"))
+                            .drop_and_build_snippet(self.$target);
+                    }
+                    
+                    $li.toggleClass("active");
+                })
+                .on('mouseover', function (event) {
+                    self.$target.removeClass(self.$overlay.find('.oe_options li.oe_style.active').data('class') || "");
+                    self.$target.addClass($(event.currentTarget).parent().data('class') || "");
+                })
+                .on('mouseout', function (event) {
+                    self.$target.removeClass($(event.currentTarget).parent().data('class') || "");
+                    self.$target.addClass(self.$overlay.find('.oe_options li.oe_style.active').data('class') || "");
+                });
         },
 
         get_parent_block: function () {
@@ -792,7 +844,7 @@
 
         set_options_background: function (bg, ul_options) {
             var $ul = this.$editor.find(ul_options);
-            var bg_value = (typeof bg === 'string' ? this.$target.find(bg) : $(bg)).css("background-image").replace(/url\(['"]*|['"]*\)/g, "");
+            var bg_value = (typeof bg === 'string' ? this.$target.find(bg) : $(bg)).css("background-image").replace(/url\(['"]*|['"]*\)|^none$/g, "");
 
             // select in ul options
             $ul.find("li").removeClass("active");
@@ -1231,6 +1283,32 @@
         }
     });
 
+    website.snippet.editorRegistry.custom_background = website.snippet.Editor.extend({
+        drop_and_build_snippet: function() {
+            var self = this;
+            var active = this.$target.hasClass(this.$el.data("class"));
+            if (active) {
+                var bg_value = this.$target.css("background-image").replace(/url\(['"]*|['"]*\)|^none$/g, "");
+                var editor = new website.editor.ImageDialog();
+                editor.on('start', self, function (o) {o.url = bg_value;});
+                editor.on('save', self, function (o) {
+                    self.$target.css("background-image", "url(" + o.url + ")");
+                });
+                editor.on('cancel', self, function () {
+                    if (bg_value === "") {
+                        self.$target.data("snippetStyles").find(".oe_style").filter(function () {
+                            return $(this).data('snipped-id') === 'custom_background';
+                        }).removeClass('active');
+                        self.$target.removeClass(self.$el.data("class"));
+                    }
+                });
+                editor.appendTo($('body'));
+            } else {
+                this.$target.css("background-image", "");
+            }
+        }
+    });
+
     /*
     * data-snippet-id automatically setted
     * Don't need to add data-snippet-id="..." into the views
-- 
cgit v1.2.3


From 31f64313c033b346530980f3d84f5a2cc5fe71c4 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 21 Nov 2013 13:34:39 +0100
Subject: [IMP] website snippet: create website.snippet.StyleEditor to add
 styles with html class and other logical process into snippet options

bzr revid: chm@openerp.com-20131121123439-wvvcdegvc1bornux
---
 .../static/src/js/website.snippets.editor.js       | 525 ++++++++++-----------
 1 file changed, 256 insertions(+), 269 deletions(-)

(limited to 'addons/website/static/src/js/website.snippets.editor.js')

diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index 7d7aade081f..a4f51c6ab39 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -77,6 +77,7 @@
         hack_to_add_snippet_id();
     });
 
+    website.snippet.styles = {};
     website.snippet.selector = [];
     website.snippet.BuildingBlock = openerp.Widget.extend({
         template: 'website.snippets',
@@ -138,22 +139,19 @@
         },
         fetch_snippet_templates: function () {
             var self = this;
-            this.style_templates = {};
 
             openerp.jsonRpc("/website/snippets", 'call', {})
                 .then(function (html) {
                     var $html = $(html);
 
-                    var $styles = $html.find("#snippet_styles");
-                    $styles.find("> [data-snippet-id]").each(function () {
+                    var $styles = $html.find("[data-snippet-style-id]");
+                    $styles.each(function () {
                         var $style = $(this);
-                        var snipped_id = $style.data('snippet-id');
-                        self.style_templates[snipped_id] = {
-                            'snipped-id' : snipped_id,
+                        var style_id = $style.data('snippet-style-id');
+                        website.snippet.styles[style_id] = {
+                            'snippet-style-id' : style_id,
                             'selector': $style.data('selector'),
-                            'class': $style.data("class"),
-                            'label': $style.find(".oe_snippet_label").text(),
-                            'group': $style.find(".oe_snippet_group").text()
+                            '$el': $style,
                         };
                     });
                     $styles.addClass("hidden");
@@ -529,13 +527,212 @@
     });
 
 
+    website.snippet.styleRegistry = {};
+    website.snippet.StyleEditor = openerp.Class.extend({
+        // initialisation (don't overwrite)
+        init: function (parent, $target, snippet_id) {
+            this.parent = parent;
+            this.$target = $target;
+            var styles = this.$target.data("snippet-style-ids") || {};
+            styles[snippet_id] = this;
+            this.$target.data("snippet-style-ids", styles);
+            this.$overlay = this.$target.data('overlay');
+            this['snippet-style-id'] = snippet_id;
+            this.$el = website.snippet.styles[snippet_id].$el.find(">li").clone();
+
+            this.required = this.$el.data("required");
+
+            this.set_active();
+            this.$el.find('li[data-class] a').on('mouseover mouseout click', _.bind(this._mouse, this));
+            this.$target.on('snippet-style-reset', _.bind(this.set_active, this));
+
+            this.start();
+        },
+        _mouse: function (event) {
+            var self = this;
+
+            if (event.type === 'mouseout') {
+                if (!this.over) return;
+                this.over = false;
+            } else if (event.type === 'click') {
+                this.over = false;
+            }else {
+                this.over = true;
+            }
+
+            var $prev, $next;
+            if (event.type === 'mouseout') {
+                $prev = $(event.currentTarget).parent();
+                $next = this.$el.find("li[data-class].active");
+            } else {
+                $prev = this.$el.find("li[data-class].active");
+                $next = $(event.currentTarget).parent();
+            }
+            if (!$prev.length) {
+                $prev = false;
+            }
+            if ($prev && $prev[0] === $next[0]) {
+                $next = false;
+                if (this.required) {
+                    return;
+                }
+            }
+
+            var np = {'$next': $next, '$prev': $prev};
+
+            if (event.type === 'click') {
+                setTimeout(function () {
+                    self.set_active();
+                    self.$target.trigger("snippet-style-change", [self, np]);
+                },0);
+                this.select(event, {'$next': $next, '$prev': $prev});
+            } else {
+                setTimeout(function () {
+                    self.$target.trigger("snippet-style-preview", [self, np]);
+                },0);
+                this.preview(event, np);
+            }
+        },
+        // start is call just after the init
+        start: function () {
+        },
+        /* select
+        *  called when a user select an item
+        *  variables: np = {$next, $prev}
+        *       $next is false if they are no next item selected
+        *       $prev is false if they are no previous item selected
+        */
+        select: function (event, np) {
+            var self = this;
+            // add or remove html class
+            if (np.$prev) {
+                this.$target.removeClass(np.$prev.data('class' || ""));
+            }
+            if (np.$next) {
+                this.$target.addClass(np.$next.data('class') || "");
+            }
+        },
+        /* preview
+        *  called when a user is on mouse over or mouse out of an item
+        *  variables: np = {$next, $prev}
+        *       $next is false if they are no next item selected
+        *       $prev is false if they are no previous item selected
+        */
+        preview: function (event, np) {
+            var self = this;
+
+            // add or remove html class
+            if (np.$prev) {
+                this.$target.removeClass(np.$prev.data('class') || "");
+            }
+            if (np.$next) {
+                this.$target.addClass(np.$next.data('class') || "");
+            }
+        },
+        /* set_active
+        *  select and set item active or not (add highlight item and his parents)
+        *  called before start
+        */
+        set_active: function () {
+            var self = this;
+            this.$el.find('li').removeClass("active");
+            var $active = this.$el.find('li[data-class]')
+                .filter(function () {
+                    var $li = $(this);
+                    return  ($li.data('class') && self.$target.hasClass($li.data('class')));
+                })
+                .first()
+                .addClass("active");
+            this.$el.find('li:has(li[data-class].active)').addClass("active");
+        }
+    });
+
+
+    website.snippet.styleRegistry['size'] = website.snippet.StyleEditor.extend({
+        select: function(event, np) {
+            this._super(event, np);
+            this.parent.parent.cover_target(this.$overlay, this.$target);
+        },
+        preview: function (event, np) {
+            this._super(event, np);
+            this.parent.parent.cover_target(this.$overlay, this.$target);
+        }
+    });
+
+    website.snippet.styleRegistry.background = website.snippet.StyleEditor.extend({
+        _get_bg: function () {
+            return this.$target.css("background-image").replace(/url\(['"]*|['"]*\)|^none$/g, "");
+        },
+        _set_bg: function (src) {
+            this.$target.css("background-image", src && src !== "" ? 'url(' + src + ')' : "");
+        },
+        start: function () {
+            this._super();
+            var src = this._get_bg();
+            this.$el.find("li[data-class].active.oe_custom_bg").data("src", src);
+        },
+        select: function(event, np) {
+            var self = this;
+            this._super(event, np);
+            if (np.$next) {
+                if (np.$next.hasClass("oe_custom_bg")) {
+                    var editor = new website.editor.ImageDialog();
+                    editor.on('start', self, function (o) {o.url = np.$prev && np.$prev.data("src") || "";});
+                    editor.on('save', self, function (o) {
+                        self._set_bg(o.url);
+                        np.$next.data("src", o.url);
+                        self.$target.trigger("snippet-style-change", [self, np]);
+                    });
+                    editor.on('cancel', self, function () {
+                        if (!np.$prev || np.$prev.data("src") === "") {
+                            np.$next.removeClass('active');
+                            self.$target.removeClass(np.$next.data("class"));
+                            self.$target.trigger("snippet-style-change", [self, np]);
+                        }
+                    });
+                    editor.appendTo($('body'));
+                } else {
+                    this._set_bg(np.$next.data("src"));
+                }
+            } else {
+                this._set_bg(false);
+            }
+        },
+        preview: function (event, np) {
+            this._super(event, np);
+            if (np.$next) {
+                this._set_bg(np.$next.data("src"));
+            }
+        },
+        set_active: function () {
+            var self = this;
+            var bg = self.$target.css("background-image");
+            this.$el.find('li').removeClass("active");
+            var $active = this.$el.find('li[data-class]')
+                .filter(function () {
+                    var $li = $(this);
+                    return  ($li.data('src') && bg.indexOf($li.data('src')) >= 0) ||
+                            (!$li.data('src') && self.$target.hasClass($li.data('class')));
+                })
+                .first();
+            if (!$active.length) {
+                $active = this.$target.css("background-image") !== 'none' ?
+                    this.$el.find('li[data-class].oe_custom_bg') :
+                    this.$el.find('li[data-class=""]');
+            }
+            $active.addClass("active");
+            this.$el.find('li:has(li[data-class].active)').addClass("active");
+        }
+    });
+
+
     website.snippet.editorRegistry = {};
     website.snippet.Editor = openerp.Class.extend({
-        init: function (parent, dom, force_snippet_id) {
+        init: function (parent, dom) {
             this.parent = parent;
             this.$target = $(dom);
             this.$overlay = this.$target.data('overlay');
-            this.snippet_id = force_snippet_id || this.$target.data("snippet-id");
+            this.snippet_id = this.$target.data("snippet-id");
             this._readXMLData();
             this.load_style_options();
             this.get_parent_block();
@@ -652,90 +849,21 @@
         },
 
         load_style_options: function () {
-            if (this.$target.data('snippetStyles')) {
-                return;
-            }
-
             var self = this;
             var $styles = this.$overlay.find('.oe_options');
             var $ul = $styles.find('ul:first');
-            _.each(this.parent.style_templates, function (val) {
+            _.each(website.snippet.styles, function (val) {
                 if (!self.parent.dom_filter(val.selector).is(self.$target)) {
                     return;
                 }
-                var $li = $("<li class='oe_style'/>").data(val);
-                $li.append($('<a/>').text(val.label));
-                if (self.$target.hasClass( val.class )) {
-                    $li.addClass("active");
-                }
-
-                if (val.group.length) {
-                    var $group = $ul.find("li.dropdown-submenu").filter(function () {
-                        return $("a:first", this).text() === val.group;
-                    });
-                    if (!$group.length) {
-                        $group = $('<li class="dropdown-submenu"><a href="#" tabindex="-1"/><ul class="dropdown-menu"/></li>');
-                        $group.find("a").text(val.group);
-                        $ul.append($group);
-                    }
-                    $group.find("ul").append($li);
-                } else {
-                    $ul.append($li);
-                }
+                var Editor = website.snippet.styleRegistry[val['snippet-style-id']] || website.snippet.StyleEditor;
+                var editor = new Editor(self, self.$target, val['snippet-style-id']);
+                $ul.prepend(editor.$el);
             });
             
             if ($ul.find("li").length) {
                 $styles.removeClass("hidden");
-                // il they are only one group, display in flat mode
-                var $groups = $ul.find("li.dropdown-submenu");
-                if ($groups.length === 1) {
-                    $ul.append($groups.find("ul li"));
-                    $groups.remove();
-                }
             }
-
-            this.$target.data('snippetStyles', $styles);
-            this.change_style();
-        },
-        change_style: function () {
-            var self = this;
-
-            this.$overlay.find('.oe_options li.oe_style a')
-                .on('click', function (event) {
-                    var $li = $(event.currentTarget).parent();
-                    var active = $li.hasClass("active");
-
-                    if ($li.hasClass("active")) {
-                        self.$target.removeClass($li.data('class'));
-                    } else {
-                        var $prev = $li.parent("ul").find("li.active").removeClass("active");
-                        if ($prev.length) {
-                            self.$target.removeClass($prev.data('class'));
-                            // active snippet after remove class
-                            if (website.snippet.editorRegistry[$prev.data("snipped-id")]) {
-                                new website.snippet.editorRegistry[$prev.data("snipped-id")](self.parent, self.$target, $prev.data("snipped-id"))
-                                    .drop_and_build_snippet(self.$target);
-                            }
-                        }
-                        self.$target.addClass($li.data('class'));
-                    }
-
-                    // active snippet after add or remove class
-                    if (website.snippet.editorRegistry[$li.data("snipped-id")]) {
-                        new website.snippet.editorRegistry[$li.data("snipped-id")](self.parent, self.$target, $li.data("snipped-id"))
-                            .drop_and_build_snippet(self.$target);
-                    }
-                    
-                    $li.toggleClass("active");
-                })
-                .on('mouseover', function (event) {
-                    self.$target.removeClass(self.$overlay.find('.oe_options li.oe_style.active').data('class') || "");
-                    self.$target.addClass($(event.currentTarget).parent().data('class') || "");
-                })
-                .on('mouseout', function (event) {
-                    self.$target.removeClass($(event.currentTarget).parent().data('class') || "");
-                    self.$target.addClass(self.$overlay.find('.oe_options li.oe_style.active').data('class') || "");
-                });
         },
 
         get_parent_block: function () {
@@ -801,59 +929,6 @@
         clean_for_save: function () {
 
         },
-
-        change_background: function (bg, ul_options, callback) {
-            var self = this;
-            this.set_options_background(bg, ul_options);
-            var $ul = this.$editor.find(ul_options);
-            var bg_value = (typeof bg === 'string' ? this.$target.find(bg) : $(bg)).css("background-image").replace(/url\(['"]*|['"]*\)/g, "");
-
-            // bind event on options
-            var $li = $ul.find("li");
-            $li.on('click', function (event) {
-                    if ($(this).data("value")) {
-                        $li.removeClass("active");
-                        $(this).addClass("active");
-                        self.$editor.find('input').val("");
-                    } else {
-                        var editor = new website.editor.ImageDialog();
-                        editor.on('start', self, function (o) {o.url = bg_value;});
-                        editor.on('save', self, function (o) {
-                            var $bg = typeof bg === 'string' ? self.$target.find(bg) : $(bg);
-                            $bg.css("background-image", "url(" + o.url + ")");
-                        });
-                        editor.appendTo($('body'));
-                    }
-                    if (callback) {
-                        callback();
-                    }
-                })
-                .on('mouseover', function (event) {
-                    if ($(this).data("value")) {
-                        var src = $(this).data("value");
-                        var $bg = typeof bg === 'string' ? self.$target.find(bg) : $(bg);
-                        $bg.css("background-image", "url(" + src + ")");
-                    }
-                })
-                .on('mouseout', function (event) {
-                    var src = $ul.find('li.active').data("value");
-                    var $bg = typeof bg === 'string' ? self.$target.find(bg) : $(bg);
-                    $bg.css("background-image", "url(" + src + ")");
-                });
-        },
-
-        set_options_background: function (bg, ul_options) {
-            var $ul = this.$editor.find(ul_options);
-            var bg_value = (typeof bg === 'string' ? this.$target.find(bg) : $(bg)).css("background-image").replace(/url\(['"]*|['"]*\)|^none$/g, "");
-
-            // select in ul options
-            $ul.find("li").removeClass("active");
-            var selected = $ul.find('[data-value="' + bg_value + '"], [data-value="' + bg_value.replace(/.*:\/\/[^\/]+/, '') + '"]');
-            selected.addClass('active');
-            if (!selected.length) {
-                $ul.find('.oe_custom_bg b').html(bg_value);
-            }
-        },
     });
 
 
@@ -1070,11 +1145,15 @@
             if(!this.$target.find(".item.active").length) {
                 this.$target.find(".item:first").addClass("active");
             }
+            this.$target.css("background-image", "");
+            console.log(this._class);
+            this.$target.removeClass(this._class);
             this.$target.removeAttr('contentEditable')
                 .find('.content, .carousel-image img')
                     .removeAttr('contentEditable');
         },
         start : function () {
+            var self = this;
             this._super();
 
             this.id = this.$target.attr("id");
@@ -1085,20 +1164,38 @@
             this.$editor.find(".js_add").on('click', _.bind(this.on_add, this));
             this.$editor.find(".js_remove").on('click', _.bind(this.on_remove, this));
 
-            this.change_background(".item.active", 'ul[name="carousel-background"]');
-            this.change_style();
-            this.change_size();
-            this.set_options_style();
-            this.$target.carousel();
+            this.rebind_event();
 
-            var self = this;
-            this.$target.on('slide.bs.carousel', function () {
-                self.set_options_style();
-                self.set_options_background(".item.active", 'ul[name="carousel-background"]');
-                self.$target.carousel();
+            // set background and prepare to clean for save
+            var add_class = function (c){
+                if (c) self._class = (self._class || "").replace(new RegExp("[ ]+" + c.replace(" ", "|[ ]+")), '') + ' ' + c;
+                return self._class || "";
+            };
+            this.$target.on('snippet-style-change snippet-style-preview', function (event, style, np) {
+                var $active = self.$target.find(".item.active");
+                if (style['snippet-style-id'] === "size") return;
+                if (style['snippet-style-id'] === "background") {
+                    $active.css("background-image", self.$target.css("background-image"));
+                }
+                if (np.$prev) {
+                    $active.removeClass(np.$prev.data("class"));
+                }
+                if (np.$next) {
+                    $active.addClass(np.$next.data("class"));
+                    add_class(np.$next.data("class"));
+                }
             });
+            this.$target.on('slid', function () { // slide.bs.carousel
+                var $active = self.$target.find(".item.active");
+                self.$target
+                    .css("background-image", $active.css("background-image"))
+                    .removeClass(add_class($active.attr("class")))
+                    .addClass($active.attr("class"))
+                    .trigger("snippet-style-reset");
 
-            this.rebind_event();
+                self.$target.carousel();
+            });
+            this.$target.trigger('slid');
         },
         // rebind event to active carousel on edit mode
         rebind_event: function () {
@@ -1121,9 +1218,15 @@
             this.$indicators.append('<li data-target="#' + this.id + '" data-slide-to="' + cycle + '"></li>');
 
             var $clone = this.$el.find(".item.active").clone();
-            var avtive_bg = $active.css("background-image").replace(/.*:\/\/[^\/]+|\)$/g, '');
-            var bg = this.$editor.find('ul[name="carousel-background"] li:not([data-value="'+ avtive_bg +'"]):first').data("value");
-            $clone.css("background-image", "url('"+ bg +"')");
+
+            // choose an other background
+            var $styles = this.$target.data("snippet-style-ids").background.$el.find("li[data-class]:not(.oe_custom_bg)");
+            var styles_index = $styles.index($styles.filter(".active")[0]);
+            var $select = $($styles[styles_index >= $styles.length-1 ? 0 : styles_index+1]);
+            $clone.css("background-image", $select.data("src") ? "url('"+ $select.data("src") +"')" : "");
+            $clone.addClass($select.data("class") || "");
+
+            // insert
             $clone.removeClass('active').insertAfter($active);
             this.$target.carousel().carousel(++index);
             this.rebind_event();
@@ -1158,78 +1261,16 @@
                 this.$target.find('.carousel-control, .carousel-indicators').addClass("hidden");
             }
         },
-        set_options_style: function () {
-            var style = false;
-            var $el = this.$inner.find('.item.active');
-            var $ul = this.$editor.find('ul[name="carousel-style"]');
-
-            if ($el.hasClass('text_only'))
-                style = 'text_only';
-            if ($el.hasClass('image_text'))
-                style = 'image_text';
-            if ($el.hasClass('text_image'))
-                style = 'text_image';
-
-            $ul.find('[data-value="' + style + '"]').addClass('active');
-        },
-        change_style: function () {
-            var self = this;
-            var $ul = this.$editor.find('ul[name="carousel-style"]');
-            var $li = $ul.find("li");
-
-            $li.on('click', function (event) {
-                    $li.removeClass("active");
-                    $(this).addClass("active");
-                })
-                .on('mouseover', function (event) {
-                    var $el = self.$inner.find('.item.active');
-                    $el.removeClass('image_text text_image text_only');
-                    $el.addClass($(event.currentTarget).data("value"));
-                })
-                .on('mouseout', function (event) {
-                    var $el = self.$inner.find('.item.active');
-                    $el.removeClass('image_text text_image text_only');
-                    $el.addClass($ul.find('li.active').data("value"));
-                });
-        },
-        change_size: function () {
-            var $el = this.$target;
-
-            var size = 'oe_big';
-            if (this.$target.hasClass('oe_small'))
-                size = 'oe_small';
-            else if (this.$target.hasClass('oe_medium'))
-                size = 'oe_medium';
-
-            var $ul = this.$editor.find('ul[name="carousel-size"]');
-            var $li = $ul.find("li");
-
-            $ul.find('[data-value="' + size + '"]').addClass('active');
-
-            $li.on('click', function (event) {
-                    $li.removeClass("active");
-                    $(this).addClass("active");
-                })
-                .on('mouseover', function (event) {
-                    $el.removeClass('oe_big oe_small oe_medium');
-                    $el.addClass($(event.currentTarget).data("value"));
-                })
-                .on('mouseout', function (event) {
-                    $el.removeClass('oe_big oe_small oe_medium');
-                    $el.addClass($ul.find('li.active').data("value"));
-                });
-        }
     });
 
     website.snippet.editorRegistry.parallax = website.snippet.editorRegistry.resize.extend({
         start : function () {
             var self = this;
             this._super();
-            this.change_background(this.$target, 'ul[name="parallax-background"]', function () {
+            this.scroll();
+            this.$target.on('snippet-style-change snippet-style-preview', function () {
                 self.$target.data("snippet-view").set_values();
             });
-            this.scroll();
-            this.change_size();
         },
         scroll: function () {
             var self = this;
@@ -1252,60 +1293,6 @@
             this.$target.find(".parallax")
                 .css("background-position", '')
                 .removeAttr("data-scroll-background-offset");
-        },
-        change_size: function () {
-            var self = this;
-
-            var size = 'oe_big';
-            if (this.$target.hasClass('oe_small'))
-                size = 'oe_small';
-            else if (this.$target.hasClass('oe_medium'))
-                size = 'oe_medium';
-            var $ul = this.$editor.find('ul[name="parallax-size"]');
-            var $li = $ul.find("li");
-
-            $ul.find('[data-value="' + size + '"]').addClass('active');
-
-            $li.on('click', function (event) {
-                    $li.removeClass("active");
-                    $(this).addClass("active");
-                    self.$target.data("snippet-view").set_values();
-                    return false;
-                })
-                .on('mouseover', function (event) {
-                    self.$target.removeClass('oe_big oe_small oe_medium');
-                    self.$target.addClass($(event.currentTarget).data("value"));
-                })
-                .on('mouseout', function (event) {
-                    self.$target.removeClass('oe_big oe_small oe_medium');
-                    self.$target.addClass($ul.find('li.active').data("value"));
-                });
-        }
-    });
-
-    website.snippet.editorRegistry.custom_background = website.snippet.Editor.extend({
-        drop_and_build_snippet: function() {
-            var self = this;
-            var active = this.$target.hasClass(this.$el.data("class"));
-            if (active) {
-                var bg_value = this.$target.css("background-image").replace(/url\(['"]*|['"]*\)|^none$/g, "");
-                var editor = new website.editor.ImageDialog();
-                editor.on('start', self, function (o) {o.url = bg_value;});
-                editor.on('save', self, function (o) {
-                    self.$target.css("background-image", "url(" + o.url + ")");
-                });
-                editor.on('cancel', self, function () {
-                    if (bg_value === "") {
-                        self.$target.data("snippetStyles").find(".oe_style").filter(function () {
-                            return $(this).data('snipped-id') === 'custom_background';
-                        }).removeClass('active');
-                        self.$target.removeClass(self.$el.data("class"));
-                    }
-                });
-                editor.appendTo($('body'));
-            } else {
-                this.$target.css("background-image", "");
-            }
         }
     });
 
-- 
cgit v1.2.3


From 4456594d400f7c3250d35e15f009bf71a7685840 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 25 Nov 2013 10:30:56 +0100
Subject: [FIX] website snippet: carousel

bzr revid: chm@openerp.com-20131125093056-7rvp01yvy63evejp
---
 addons/website/static/src/js/website.snippets.editor.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'addons/website/static/src/js/website.snippets.editor.js')

diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index a4f51c6ab39..73691ad65d5 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -1125,7 +1125,8 @@
                     id = _id + 1;
                 }
             });
-            this.$target.attr("id", "myCarousel" + id);
+            this.id = "myCarousel" + id;
+            this.$target.attr("id", this.id);
             this.$target.find(".carousel-control").attr("href", "#myCarousel" + id);
             this.$target.find("[data-target='#myCarousel']").attr("data-target", "#myCarousel" + id);
 
-- 
cgit v1.2.3


From 5304a26eb0aa4da353f715a729f2a337ecbd5c65 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 27 Nov 2013 15:31:19 +0100
Subject: [FIX] website snippet: fix drop widget

bzr revid: chm@openerp.com-20131127143119-zlp7iytxexznfrt6
---
 addons/website/static/src/js/website.snippets.editor.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'addons/website/static/src/js/website.snippets.editor.js')

diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index 73691ad65d5..f31600866fc 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -324,14 +324,12 @@
                             }
                         },
                         out:    function(){
-                            if( action === 'insert'){
+                            var prev = $toInsert.prev();
+                            if( action === 'insert' && prev && this != prev[0]){
                                 dropped = false;
                                 $toInsert.detach();
                             }
-                        },
-                        drop:   function(){
-                            dropped = true;
-                        },
+                        }
                     });
                 },
                 stop: function(ev, ui){
-- 
cgit v1.2.3


From ec17291b199c9f3834c23e5982d298964ed61cbe Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 27 Nov 2013 15:42:52 +0100
Subject: [FIX] website: snippet cut the defaulut text

bzr revid: chm@openerp.com-20131127144252-moppy3j5um58e935
---
 addons/website/static/src/js/website.snippets.editor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/website/static/src/js/website.snippets.editor.js')

diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index f31600866fc..ac3c38a8278 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -325,7 +325,7 @@
                         },
                         out:    function(){
                             var prev = $toInsert.prev();
-                            if( action === 'insert' && prev && this != prev[0]){
+                            if( action === 'insert' && this === prev[0]){
                                 dropped = false;
                                 $toInsert.detach();
                             }
-- 
cgit v1.2.3


From d1d1754ff47d4d60d45cbb58d3486e06fac2c17b Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 27 Nov 2013 17:59:14 +0100
Subject: [FIX] website snippet: background of quotes slider

bzr revid: chm@openerp.com-20131127165914-i4tgbj1fi1q2dqin
---
 addons/website/static/src/js/website.snippets.editor.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/website/static/src/js/website.snippets.editor.js')

diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index ac3c38a8278..e296850e54b 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -675,7 +675,7 @@
             if (np.$next) {
                 if (np.$next.hasClass("oe_custom_bg")) {
                     var editor = new website.editor.ImageDialog();
-                    editor.on('start', self, function (o) {o.url = np.$prev && np.$prev.data("src") || "";});
+                    editor.on('start', self, function (o) {o.url = np.$prev && np.$prev.data("src") || np.$next && np.$next.data("src") || "";});
                     editor.on('save', self, function (o) {
                         self._set_bg(o.url);
                         np.$next.data("src", o.url);
@@ -683,7 +683,6 @@
                     });
                     editor.on('cancel', self, function () {
                         if (!np.$prev || np.$prev.data("src") === "") {
-                            np.$next.removeClass('active');
                             self.$target.removeClass(np.$next.data("class"));
                             self.$target.trigger("snippet-style-change", [self, np]);
                         }
@@ -694,6 +693,7 @@
                 }
             } else {
                 this._set_bg(false);
+                this.$target.removeClass(np.$prev.data("class"));
             }
         },
         preview: function (event, np) {
-- 
cgit v1.2.3


From 9a399dfb9461acfb6ebe53779aed1012421f2846 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 29 Nov 2013 17:00:45 +0100
Subject: [FIX] website snippets: quote, quotes slider, parallax

bzr revid: chm@openerp.com-20131129160045-527o2i6unyyymr6e
---
 .../static/src/js/website.snippets.editor.js       | 240 ++++++++++++---------
 1 file changed, 143 insertions(+), 97 deletions(-)

(limited to 'addons/website/static/src/js/website.snippets.editor.js')

diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index e296850e54b..ebbe0bf5dd8 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -350,7 +350,18 @@
                             website.snippet.start_animation();
 
                             self.create_overlay($target);
-                            $target.data("snippet-editor").drop_and_build_snippet($target);
+                            if ($snippet.data("snippet-editor")) {
+                                $target.data("snippet-editor").drop_and_build_snippet($target);
+                            }
+
+                            $target.find("[data-snippet-id]").each(function () {
+                                var $snippet = $(this);
+                                var snippet_id = $snippet.data("data-snippet-id");
+                                self.create_overlay($snippet);
+                                if ($snippet.data("snippet-editor")) {
+                                    $snippet.data("snippet-editor").drop_and_build_snippet($snippet);
+                                }
+                            });
 
                         } else {
                             $target = $(this).data('target');
@@ -837,15 +848,6 @@
             setTimeout(function () {self.parent.create_overlay(self.$target);},0);
         },
 
-        _clone: function () {
-            var self = this;
-            this.$overlay.on('click', '.oe_snippet_clone', function () {
-                var $clone = self.$target.clone(false);
-                self.$target.after($clone);
-                return false;
-            });
-        },
-
         load_style_options: function () {
             var self = this;
             var $styles = this.$overlay.find('.oe_options');
@@ -887,16 +889,24 @@
         */
         start: function () {
             var self = this;
-            this.$overlay.on('click', '.oe_snippet_remove', function () {
-                self.onBlur();
-                var index = _.indexOf(self.parent.snippets, self.$target.get(0));
-                delete self.parent.snippets[index];
-                self.$target.remove();
-                self.$overlay.remove();
-                return false;
-            });
+            this.$overlay.on('click', '.oe_snippet_clone', _.bind(this.on_clone, this));
+            this.$overlay.on('click', '.oe_snippet_remove', _.bind(this.on_remove, this));
             this._drag_and_drop();
-            this._clone();
+        },
+
+        on_clone: function () {
+            var $clone = this.$target.clone(false);
+            this.$target.after($clone);
+            return false;
+        },
+
+        on_remove: function () {
+            this.onBlur();
+            var index = _.indexOf(this.parent.snippets, this.$target.get(0));
+            delete this.parent.snippets[index];
+            this.$target.remove();
+            this.$overlay.remove();
+            return false;
         },
 
         /*
@@ -925,7 +935,7 @@
         *  function called just before save vue
         */
         clean_for_save: function () {
-
+            this.$target.find(".row:empty").remove();
         },
     });
 
@@ -1059,7 +1069,6 @@
 
             return this.grid;
         },
-
         _drag_and_drop_after_insert_dropzone: function(){
             var self = this;
             var $zones = $(".row:has(> .oe_drop_zone)").each(function () {
@@ -1088,7 +1097,24 @@
             this.$target.addClass("col-md-offset-" + this.$target.prevAll(".oe_drop_to_remove").length);
             this._super();
         },
-
+        onFocus : function () {
+            this._super();
+            this.$overlay.find('.oe_snippet_remove').toggleClass("hidden", !this.$target.siblings().length);
+        },
+        on_clone: function () {
+            var $clone = this.$target.clone(false);
+            var _class = $clone.attr("class").replace(/\s*(col-md-|col-lg-offset-|col-md-offset-)([0-9-]+)/g, '');
+            _class += ' col-md-1';
+            $clone.attr("class", _class);
+            this.$target.after($clone);
+            return false;
+        },
+        on_remove: function () {
+            if (!this.$target.siblings().length){
+                return false;
+            }
+            return this._super();
+        },
         on_resize: function (compass, beginClass, current) {
             if (compass !== 'w')
                 return;
@@ -1113,12 +1139,12 @@
             }
         },
     });
-
-    website.snippet.editorRegistry.carousel = website.snippet.editorRegistry.resize.extend({
+ 
+    website.snippet.editorRegistry.slider = website.snippet.editorRegistry.resize.extend({
         drop_and_build_snippet: function() {
             var id = 0;
-            $("body .carousel").each(function () {
-                var _id = +$(this).attr("id").replace(/^myCarousel/, '');
+            $(".carousel").each(function () {
+                var _id = +$(this).attr("id").replace(/^[^a-z]+/i, '');
                 if (id <= _id) {
                     id = _id + 1;
                 }
@@ -1126,44 +1152,108 @@
             this.id = "myCarousel" + id;
             this.$target.attr("id", this.id);
             this.$target.find(".carousel-control").attr("href", "#myCarousel" + id);
-            this.$target.find("[data-target='#myCarousel']").attr("data-target", "#myCarousel" + id);
+            this.$target.find("[data-target]").attr("data-target", "#myCarousel" + id);
 
             this.rebind_event();
         },
-        onFocus: function () {
-            this._super();
+        // rebind event to active carousel on edit mode
+        rebind_event: function () {
+            var self = this;
+            this.$target.find('.carousel-indicators [data-target]').off('click').on('click', function () {
+                self.$target.carousel(+$(this).data('slide-to')); });
+
+            this.$target.attr('contentEditable', 'false')
+                .find('.oe_structure, blockquote').attr('contentEditable', 'true');
+
             this.$target.carousel('pause');
         },
-        onBlur: function () {
-            this._super();
-            this.$target.carousel('cycle');
-        },
         clean_for_save: function () {
             this._super();
             this.$target.find(".item").removeClass("next prev left right");
             if(!this.$target.find(".item.active").length) {
                 this.$target.find(".item:first").addClass("active");
             }
-            this.$target.css("background-image", "");
-            console.log(this._class);
-            this.$target.removeClass(this._class);
             this.$target.removeAttr('contentEditable')
-                .find('.content, .carousel-image img')
-                    .removeAttr('contentEditable');
+                .find('*').removeAttr('contentEditable');
+        },
+        onFocus: function () {
+            this._super();
+            this.$target.carousel('pause');
+        },
+        onBlur: function () {
+            this._super();
+            this.$target.carousel('cycle');
         },
         start : function () {
-            var self = this;
             this._super();
-
             this.id = this.$target.attr("id");
-
             this.$inner = this.$target.find('.carousel-inner');
             this.$indicators = this.$target.find('.carousel-indicators');
 
-            this.$editor.find(".js_add").on('click', _.bind(this.on_add, this));
-            this.$editor.find(".js_remove").on('click', _.bind(this.on_remove, this));
+            this.$editor.find(".js_add").on('click', _.bind(this.on_add_slide, this));
+            this.$editor.find(".js_remove").on('click', _.bind(this.on_remove_slide, this));
 
             this.rebind_event();
+        },
+        on_add_slide: function () {
+            var self = this;
+            var cycle = this.$inner.find('.item').length;
+            var $active = this.$inner.find('.item.active, .item.prev, .item.next').first();
+            var index = $active.index();
+            this.$target.find('.carousel-control, .carousel-indicators').removeClass("hidden");
+            this.$indicators.append('<li data-target="#' + this.id + '" data-slide-to="' + cycle + '"></li>');
+
+            var $clone = this.$el.find(".item.active").clone();
+
+            // insert
+            $clone.removeClass('active').insertAfter($active);
+            setTimeout(function() {
+                self.$target.carousel().carousel(++index);
+                self.rebind_event();
+            },0);
+            return $clone;
+        },
+        on_remove_slide: function () {
+            if (this.remove_process) {
+                return;
+            }
+            var self = this;
+            var new_index = 0;
+            var cycle = this.$inner.find('.item').length - 1;
+            var index = this.$inner.find('.item.active').index();
+            
+            if (cycle > 0) {
+                this.remove_process = true;
+                var $el = this.$inner.find('.item.active');
+                self.$target.on('slid.bs.carousel', function (event) {
+                    $el.remove();
+                    self.$indicators.find("li:last").remove();
+                    self.$target.off('slid.bs.carousel');
+                    self.rebind_event();
+                    self.remove_process = false;
+                    if (cycle == 1) {
+                        self.on_remove_slide(event);
+                    }
+                });
+                setTimeout(function () {
+                    self.$target.carousel( index > 0 ? --index : cycle );
+                }, 500);
+            } else {
+                this.$target.find('.carousel-control, .carousel-indicators').addClass("hidden");
+            }
+        },
+    });
+
+    website.snippet.editorRegistry.carousel = website.snippet.editorRegistry.slider.extend({
+        clean_for_save: function () {
+            this._super();
+            this.$target.css("background-image", "");
+            this.$target.removeClass(this._class);
+            this.$target.find('.content, .carousel-image img').attr('contentEditable', 'true');
+        },
+        start : function () {
+            var self = this;
+            this._super();
 
             // set background and prepare to clean for save
             var add_class = function (c){
@@ -1196,27 +1286,8 @@
             });
             this.$target.trigger('slid');
         },
-        // rebind event to active carousel on edit mode
-        rebind_event: function () {
-            var self = this;
-            this.$target.off('click').on('click', '.carousel-control', function () {
-                self.$target.carousel($(this).data('slide')); });
-            this.$target.off('click').on('click', '.carousel-indicators [data-target]', function () {
-                self.$target.carousel(+$(this).data('slide-to')); });
-
-            this.$target.attr('contentEditable', 'false')
-                .find('.content, .carousel-image img')
-                    .attr('contentEditable', 'true');
-        },
-        on_add: function (e) {
-            e.preventDefault();
-            var cycle = this.$inner.find('.item').length;
-            var $active = this.$inner.find('.item.active, .item.prev, .item.next').first();
-            var index = $active.index();
-            this.$target.find('.carousel-control, .carousel-indicators').removeClass("hidden");
-            this.$indicators.append('<li data-target="#' + this.id + '" data-slide-to="' + cycle + '"></li>');
-
-            var $clone = this.$el.find(".item.active").clone();
+        on_add_slide: function () {
+            var $clone = this._super();
 
             // choose an other background
             var $styles = this.$target.data("snippet-style-ids").background.$el.find("li[data-class]:not(.oe_custom_bg)");
@@ -1225,40 +1296,14 @@
             $clone.css("background-image", $select.data("src") ? "url('"+ $select.data("src") +"')" : "");
             $clone.addClass($select.data("class") || "");
 
-            // insert
-            $clone.removeClass('active').insertAfter($active);
-            this.$target.carousel().carousel(++index);
-            this.rebind_event();
+            return $clone;
         },
-        on_remove: function (e) {
-            e.preventDefault();
-            if (this.remove_process) {
-                return;
-            }
+        // rebind event to active carousel on edit mode
+        rebind_event: function () {
             var self = this;
-            var new_index = 0;
-            var cycle = this.$inner.find('.item').length - 1;
-            var index = this.$inner.find('.item.active').index();
-            
-            if (cycle > 0) {
-                this.remove_process = true;
-                var $el = this.$inner.find('.item.active');
-                self.$target.on('slid.bs.carousel', function (event) {
-                    $el.remove();
-                    self.$indicators.find("li:last").remove();
-                    self.$target.off('slid.bs.carousel');
-                    self.rebind_event();
-                    self.remove_process = false;
-                    if (cycle == 1) {
-                        self.on_remove(e);
-                    }
-                });
-                setTimeout(function () {
-                    self.$target.carousel( index > 0 ? --index : cycle );
-                }, 500);
-            } else {
-                this.$target.find('.carousel-control, .carousel-indicators').addClass("hidden");
-            }
+            this.$target.find('.carousel-control').off('click').on('click', function () {
+                self.$target.carousel( $(this).data('slide')); });
+            this._super();
         },
     });
 
@@ -1300,7 +1345,8 @@
     * Don't need to add data-snippet-id="..." into the views
     */
 
-    website.snippet.selector.push([".row > div[class*='col-md-']", 'colmd']);
+    website.snippet.selector.push([".row > [class*='col-md-']", 'colmd']);
     website.snippet.selector.push(['hr', 'hr']);
+    website.snippet.selector.push(['blockquote', 'quote']);
 
 })();
-- 
cgit v1.2.3


From bd753f6e8fbd1022e6844a76bc6916ded0b3a8da Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 3 Dec 2013 10:26:41 +0100
Subject: [FIX] website snippet: carousel contentEditable

bzr revid: chm@openerp.com-20131203092641-6o3bsuayl71t0l7s
---
 addons/website/static/src/js/website.snippets.editor.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'addons/website/static/src/js/website.snippets.editor.js')

diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index ebbe0bf5dd8..6d9a2ff0ea1 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -1162,8 +1162,8 @@
             this.$target.find('.carousel-indicators [data-target]').off('click').on('click', function () {
                 self.$target.carousel(+$(this).data('slide-to')); });
 
-            this.$target.attr('contentEditable', 'false')
-                .find('.oe_structure, blockquote').attr('contentEditable', 'true');
+            this.$target.attr('contentEditable', 'false');
+            this.$target.find('.oe_structure, blockquote').attr('contentEditable', 'true');
 
             this.$target.carousel('pause');
         },
@@ -1303,6 +1303,8 @@
             var self = this;
             this.$target.find('.carousel-control').off('click').on('click', function () {
                 self.$target.carousel( $(this).data('slide')); });
+
+            this.$target.find('.carousel-image img, .content').attr('contentEditable', 'true');
             this._super();
         },
     });
-- 
cgit v1.2.3


From 78dedf2dff12fa659fc864bbf699c9c468022db2 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 3 Dec 2013 11:04:49 +0100
Subject: [IMP] website snippet: icones goto parent snippet, clean css,
 unactive snippet when click outside

bzr revid: chm@openerp.com-20131203100449-7ups314ffru0kobh
---
 .../static/src/js/website.snippets.editor.js       | 37 +++++++++++-----------
 1 file changed, 19 insertions(+), 18 deletions(-)

(limited to 'addons/website/static/src/js/website.snippets.editor.js')

diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index 6d9a2ff0ea1..c083aeea70f 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -184,23 +184,24 @@
         bind_snippet_click_editor: function () {
             var self = this;
             var snipped_event_flag = false;
-            $("body").on('click', "[data-oe-model] [data-snippet-id], [data-oe-model][data-snippet-id]", function (event) {
-                    if (snipped_event_flag) {
-                        return;
-                    }
-                    snipped_event_flag = true;
-                    setTimeout(function () {snipped_event_flag = false;}, 0);
-                    var $target = $(event.currentTarget);
-                    if (self.$active_snipped_id && self.$active_snipped_id.is($target)) {
-                        return;
-                    }
-                    self.make_active($target);
-                });
-            $("[data-oe-model]").on('click', function () {
-                    if (!snipped_event_flag && self.$active_snipped_id && !self.$active_snipped_id.parents("[data-snippet-id]:first")) {
-                        self.make_active(false);
-                    }
-                });
+            $("#wrapwrap").on('click', function (event) {
+                if (snipped_event_flag) {
+                    return;
+                }
+                snipped_event_flag = true;
+                setTimeout(function () {snipped_event_flag = false;}, 0);
+                var $target = $(event.srcElement);
+                if (!$target.attr("data-snippet-id")) {
+                    $target = $target.parents("[data-snippet-id]:first");
+                }
+                if (!$target.attr("data-oe-model") && !$target.parents("[data-oe-model]:first").length) {
+                    $target = false;
+                }
+                if (self.$active_snipped_id && self.$active_snipped_id.is($target)) {
+                    return;
+                }
+                self.make_active($target);
+            });
         },
         snippet_blur: function ($snipped_id) {
             if ($snipped_id) {
@@ -233,7 +234,7 @@
                 this.snippet_blur(this.$active_snipped_id);
                 this.$active_snipped_id = false;
             }
-            if ($snipped_id) {
+            if ($snipped_id && $snipped_id.length) {
                 if(_.indexOf(this.snippets, $snipped_id.get(0)) === -1) {
                     this.snippets.push($snipped_id.get(0));
                 }
-- 
cgit v1.2.3


From 16a544fc6f5f2afe1b94359af6331eb58f197438 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 4 Dec 2013 12:54:24 +0100
Subject: [FIX] website snippet: usabillity

bzr revid: chm@openerp.com-20131204115424-p083i2nt5bbc43s6
---
 .../website/static/src/js/website.snippets.editor.js | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

(limited to 'addons/website/static/src/js/website.snippets.editor.js')

diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index c083aeea70f..aad19ff5da9 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -301,7 +301,11 @@
 
                         $toInsert = $snippet.find('.oe_snippet_body').clone();
                         $toInsert.removeClass('oe_snippet_body');
-                        $toInsert.attr('data-snippet-id', snipped_id);
+                        if (!$toInsert.data('snippet-id')) {
+                            $toInsert.attr('data-snippet-id', snipped_id);
+                        } else {
+                            snipped_id = $toInsert.data('snippet-id');
+                        }
 
                     } else if( action === 'mutate' ){
                         if (!$snippet.data('selector')) {
@@ -936,7 +940,8 @@
         *  function called just before save vue
         */
         clean_for_save: function () {
-            this.$target.find(".row:empty").remove();
+            this.$target.removeAttr('contentEditable')
+                .find('*').removeAttr('contentEditable');
         },
     });
 
@@ -1104,7 +1109,7 @@
         },
         on_clone: function () {
             var $clone = this.$target.clone(false);
-            var _class = $clone.attr("class").replace(/\s*(col-md-|col-lg-offset-|col-md-offset-)([0-9-]+)/g, '');
+            var _class = $clone.attr("class").replace(/\s*(col-lg-offset-|col-md-offset-)([0-9-]+)/g, '');
             _class += ' col-md-1';
             $clone.attr("class", _class);
             this.$target.after($clone);
@@ -1174,8 +1179,6 @@
             if(!this.$target.find(".item.active").length) {
                 this.$target.find(".item:first").addClass("active");
             }
-            this.$target.removeAttr('contentEditable')
-                .find('*').removeAttr('contentEditable');
         },
         onFocus: function () {
             this._super();
@@ -1186,13 +1189,14 @@
             this.$target.carousel('cycle');
         },
         start : function () {
+            var self = this;
             this._super();
             this.id = this.$target.attr("id");
             this.$inner = this.$target.find('.carousel-inner');
             this.$indicators = this.$target.find('.carousel-indicators');
 
-            this.$editor.find(".js_add").on('click', _.bind(this.on_add_slide, this));
-            this.$editor.find(".js_remove").on('click', _.bind(this.on_remove_slide, this));
+            this.$editor.find(".js_add").on('click', function () {self.on_add_slide(); return false;});
+            this.$editor.find(".js_remove").on('click', function () {self.on_remove_slide(); return false;});
 
             this.rebind_event();
         },
@@ -1318,6 +1322,8 @@
             this.$target.on('snippet-style-change snippet-style-preview', function () {
                 self.$target.data("snippet-view").set_values();
             });
+            this.$target.attr('contentEditable', 'false');
+            this.$target.find('> div > .oe_structure').attr('contentEditable', 'true');
         },
         scroll: function () {
             var self = this;
-- 
cgit v1.2.3


From 58eb518155f2e5e7ad33be8346ac79c165fc88ac Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 4 Dec 2013 14:07:40 +0100
Subject: [FIX] website snippet: slider

bzr revid: chm@openerp.com-20131204130740-mk8jtp8p6ip16q1a
---
 addons/website/static/src/js/website.snippets.editor.js | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'addons/website/static/src/js/website.snippets.editor.js')

diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index aad19ff5da9..ef1afe88d47 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -1148,13 +1148,7 @@
  
     website.snippet.editorRegistry.slider = website.snippet.editorRegistry.resize.extend({
         drop_and_build_snippet: function() {
-            var id = 0;
-            $(".carousel").each(function () {
-                var _id = +$(this).attr("id").replace(/^[^a-z]+/i, '');
-                if (id <= _id) {
-                    id = _id + 1;
-                }
-            });
+            var id = $(".carousel").length;
             this.id = "myCarousel" + id;
             this.$target.attr("id", this.id);
             this.$target.find(".carousel-control").attr("href", "#myCarousel" + id);
-- 
cgit v1.2.3


From d9b40743b817ae767a594e73208a414b2eba9420 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 4 Dec 2013 18:16:12 +0100
Subject: [FIX] website snippet: bootstrap dropdown (prevent default of click
 event)

bzr revid: chm@openerp.com-20131204171612-x32bxqzrul1c3zev
---
 addons/website/static/src/js/website.snippets.editor.js | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'addons/website/static/src/js/website.snippets.editor.js')

diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index ef1afe88d47..22582ecc9e3 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -136,6 +136,10 @@
 
             this.$modal = $(openerp.qweb.render('website.snippets_modal'));
             this.$modal.appendTo("body");
+
+            $(document).on('click', '.dropdown-submenu a[tabindex]', function (e) {
+                e.preventDefault();
+            });
         },
         fetch_snippet_templates: function () {
             var self = this;
-- 
cgit v1.2.3


From 74ed3d2e5f2d0a3434bdd8c5704a079cdba59073 Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Fri, 6 Dec 2013 14:32:39 +0100
Subject: [FIX] Make tour declarative to enable autotests

bzr revid: ddm@openerp.com-20131206133239-mrhduf2fi0sm8sh7
---
 .../static/src/js/website.snippets.editor.js       | 51 ++++++++++++----------
 1 file changed, 27 insertions(+), 24 deletions(-)

(limited to 'addons/website/static/src/js/website.snippets.editor.js')

diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index 22582ecc9e3..b93d1c2c761 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -207,17 +207,17 @@
                 self.make_active($target);
             });
         },
-        snippet_blur: function ($snipped_id) {
-            if ($snipped_id) {
-                if ($snipped_id.data("snippet-editor")) {
-                    $snipped_id.data("snippet-editor").onBlur();
+        snippet_blur: function ($snippet) {
+            if ($snippet) {
+                if ($snippet.data("snippet-editor")) {
+                    $snippet.data("snippet-editor").onBlur();
                 }
             }
         },
-        snippet_focus: function ($snipped_id) {
-            if ($snipped_id) {
-                if ($snipped_id.data("snippet-editor")) {
-                    $snipped_id.data("snippet-editor").onFocus();
+        snippet_focus: function ($snippet) {
+            if ($snippet) {
+                if ($snippet.data("snippet-editor")) {
+                    $snippet.data("snippet-editor").onFocus();
                 }
             }
         },
@@ -230,31 +230,34 @@
                 }
             }
         },
-        make_active: function ($snipped_id) {
-            if ($snipped_id && this.$active_snipped_id && this.$active_snipped_id.get(0) === $snipped_id.get(0)) {
+        make_active: function ($snippet) {
+            if ($snippet && this.$active_snipped_id && this.$active_snipped_id.get(0) === $snippet.get(0)) {
                 return;
             }
             if (this.$active_snipped_id) {
                 this.snippet_blur(this.$active_snipped_id);
                 this.$active_snipped_id = false;
             }
-            if ($snipped_id && $snipped_id.length) {
-                if(_.indexOf(this.snippets, $snipped_id.get(0)) === -1) {
-                    this.snippets.push($snipped_id.get(0));
+            if ($snippet && $snippet.length) {
+                if(_.indexOf(this.snippets, $snippet.get(0)) === -1) {
+                    this.snippets.push($snippet.get(0));
                 }
-                this.$active_snipped_id = $snipped_id;
+                this.$active_snipped_id = $snippet;
                 this.create_overlay(this.$active_snipped_id);
-                this.snippet_focus($snipped_id);
+                this.snippet_focus($snippet);
+            }
+            if (_.isFunction($snippet.trigger)) {
+                $snippet.trigger('tour:snippet_activated');
             }
         },
-        create_overlay: function ($snipped_id) {
-            if (typeof $snipped_id.data("snippet-editor") === 'undefined') {
-                var $targets = this.activate_overlay_zones($snipped_id);
+        create_overlay: function ($snippet) {
+            if (typeof $snippet.data("snippet-editor") === 'undefined') {
+                var $targets = this.activate_overlay_zones($snippet);
                 if (!$targets.length) return;
-                var editor = website.snippet.editorRegistry[$snipped_id.data("snippet-id")] || website.snippet.editorRegistry.resize;
-                $snipped_id.data("snippet-editor", new editor(this, $snipped_id));
+                var editor = website.snippet.editorRegistry[$snippet.data("snippet-id")] || website.snippet.editorRegistry.resize;
+                $snippet.data("snippet-editor", new editor(this, $snippet));
             }
-            this.cover_target($snipped_id.data('overlay'), $snipped_id);
+            this.cover_target($snippet.data('overlay'), $snippet);
         },
 
         path_eval: function(path){
@@ -869,7 +872,7 @@
                 var editor = new Editor(self, self.$target, val['snippet-style-id']);
                 $ul.prepend(editor.$el);
             });
-            
+
             if ($ul.find("li").length) {
                 $styles.removeClass("hidden");
             }
@@ -1149,7 +1152,7 @@
             }
         },
     });
- 
+
     website.snippet.editorRegistry.slider = website.snippet.editorRegistry.resize.extend({
         drop_and_build_snippet: function() {
             var id = $(".carousel").length;
@@ -1224,7 +1227,7 @@
             var new_index = 0;
             var cycle = this.$inner.find('.item').length - 1;
             var index = this.$inner.find('.item.active').index();
-            
+
             if (cycle > 0) {
                 this.remove_process = true;
                 var $el = this.$inner.find('.item.active');
-- 
cgit v1.2.3


From 1071cdb1d3dc347d747458f9fcd51ef75d5a92d3 Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Fri, 6 Dec 2013 16:08:55 +0100
Subject: [IMP] Improve event support for tour and tests

bzr revid: ddm@openerp.com-20131206150855-0jsw3i2lm2l3qant
---
 addons/website/static/src/js/website.snippets.editor.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'addons/website/static/src/js/website.snippets.editor.js')

diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index b93d1c2c761..af2183b576c 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -26,7 +26,6 @@
                 self.snippets.$button.removeClass("hidden");
                 website.snippet.stop_animation();
                 website.snippet.start_animation();
-                self.trigger('tour:editor_bar_loaded');
             });
 
             return this._super.apply(this, arguments);
@@ -247,7 +246,7 @@
                 this.snippet_focus($snippet);
             }
             if (_.isFunction($snippet.trigger)) {
-                $snippet.trigger('tour:snippet_activated');
+                $snippet.trigger('snippet-activated');
             }
         },
         create_overlay: function ($snippet) {
@@ -384,7 +383,10 @@
                                 snippet.drop_and_build_snippet($target);
                             }
                         }
-                        setTimeout(function () {self.make_active($target);},0);
+                        setTimeout(function () {
+                            $snippet.trigger('snippet-dropped');
+                            self.make_active($target);
+                        },0);
                     } else {
                         $toInsert.remove();
                         if (self.$modal.find('input:not(:checked)').length) {
-- 
cgit v1.2.3


From d4c38fc501e2e55f4ce8aa267a6287de862b270f Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 6 Dec 2013 16:47:59 +0100
Subject: [IMP] website snippet: change trigger of dropped and activate snippet
 for tour and runbot snippet tests

bzr revid: chm@openerp.com-20131206154759-7t67lat285zrc2mk
---
 addons/website/static/src/js/website.snippets.editor.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'addons/website/static/src/js/website.snippets.editor.js')

diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index af2183b576c..53ea79fe907 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -245,9 +245,7 @@
                 this.create_overlay(this.$active_snipped_id);
                 this.snippet_focus($snippet);
             }
-            if (_.isFunction($snippet.trigger)) {
-                $snippet.trigger('snippet-activated');
-            }
+            $("#oe_snippets").trigger('snippet-activated', $snippet);
         },
         create_overlay: function ($snippet) {
             if (typeof $snippet.data("snippet-editor") === 'undefined') {
@@ -384,7 +382,7 @@
                             }
                         }
                         setTimeout(function () {
-                            $snippet.trigger('snippet-dropped');
+                            $("#oe_snippets").trigger('snippet-dropped', $target);
                             self.make_active($target);
                         },0);
                     } else {
-- 
cgit v1.2.3


From 3f550a2e1184fb7e6d0de944e172e4576a0717d1 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 6 Dec 2013 17:31:22 +0100
Subject: [ADD] website: test.js

bzr revid: chm@openerp.com-20131206163122-zuvttkq5o0ktlt85
---
 addons/website/static/src/js/website.snippets.editor.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'addons/website/static/src/js/website.snippets.editor.js')

diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index 53ea79fe907..ef4c029280e 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -305,6 +305,7 @@
 
                         $toInsert = $snippet.find('.oe_snippet_body').clone();
                         $toInsert.removeClass('oe_snippet_body');
+                        $toInsert.data('src-snippet-id', snipped_id);
                         if (!$toInsert.data('snippet-id')) {
                             $toInsert.attr('data-snippet-id', snipped_id);
                         } else {
-- 
cgit v1.2.3


From 5f0fcfb9be0695a2e0fba5e4ea85c449b7f5af8b Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Mon, 9 Dec 2013 12:25:34 +0100
Subject: [IMP] Tour improvements => automated tests

bzr revid: ddm@openerp.com-20131209112534-3ysihjgm20jj3d9k
---
 addons/website/static/src/js/website.snippets.editor.js | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'addons/website/static/src/js/website.snippets.editor.js')

diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index ef4c029280e..e605bba3d1b 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -246,6 +246,9 @@
                 this.snippet_focus($snippet);
             }
             $("#oe_snippets").trigger('snippet-activated', $snippet);
+            if ($snippet) {
+                $snippet.trigger('snippet-activated', $snippet);
+            }
         },
         create_overlay: function ($snippet) {
             if (typeof $snippet.data("snippet-editor") === 'undefined') {
-- 
cgit v1.2.3


From 6e229fa852d57ac1d30f5a48b6c82299af5e4536 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 10 Dec 2013 11:56:37 +0100
Subject: [FIX] website: bad css (+remove a wrong js line)

bzr revid: chm@openerp.com-20131210105637-uebvqry67urydl0n
---
 addons/website/static/src/js/website.snippets.editor.js | 1 -
 1 file changed, 1 deletion(-)

(limited to 'addons/website/static/src/js/website.snippets.editor.js')

diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index e605bba3d1b..16e76ee5f6e 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -1259,7 +1259,6 @@
             this._super();
             this.$target.css("background-image", "");
             this.$target.removeClass(this._class);
-            this.$target.find('.content, .carousel-image img').attr('contentEditable', 'true');
         },
         start : function () {
             var self = this;
-- 
cgit v1.2.3


From 3421edaf949df041a94a311e469c8c224e8dbb6a Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 10 Dec 2013 13:08:57 +0100
Subject: [IMP] website: clean css code for banner

bzr revid: chm@openerp.com-20131210120857-ii53g67n42sha51b
---
 addons/website/static/src/js/website.snippets.editor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/website/static/src/js/website.snippets.editor.js')

diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index 16e76ee5f6e..a014f596a97 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -1313,7 +1313,7 @@
             this.$target.find('.carousel-control').off('click').on('click', function () {
                 self.$target.carousel( $(this).data('slide')); });
 
-            this.$target.find('.carousel-image img, .content').attr('contentEditable', 'true');
+            this.$target.find('.carousel-image, .content').attr('contentEditable', 'true');
             this._super();
         },
     });
-- 
cgit v1.2.3


From bbecbabb746ea51ae013b5203b7977c513612c98 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 10 Dec 2013 13:54:15 +0100
Subject: [FIX] website: Can't duplicate a snippet of type quote

bzr revid: chm@openerp.com-20131210125415-tur8ibjjejyyb1ne
---
 addons/website/static/src/js/website.snippets.editor.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'addons/website/static/src/js/website.snippets.editor.js')

diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index a014f596a97..55a920eab28 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -1114,9 +1114,12 @@
             this.$target.addClass("col-md-offset-" + this.$target.prevAll(".oe_drop_to_remove").length);
             this._super();
         },
+        hide_remove_button: function() {
+            this.$overlay.find('.oe_snippet_remove').toggleClass("hidden", !this.$target.siblings().length);
+        },
         onFocus : function () {
             this._super();
-            this.$overlay.find('.oe_snippet_remove').toggleClass("hidden", !this.$target.siblings().length);
+            this.hide_remove_button();
         },
         on_clone: function () {
             var $clone = this.$target.clone(false);
@@ -1124,13 +1127,16 @@
             _class += ' col-md-1';
             $clone.attr("class", _class);
             this.$target.after($clone);
+            this.hide_remove_button();
             return false;
         },
         on_remove: function () {
             if (!this.$target.siblings().length){
                 return false;
             }
-            return this._super();
+            this._super();
+            this.hide_remove_button();
+            return false;
         },
         on_resize: function (compass, beginClass, current) {
             if (compass !== 'w')
@@ -1174,7 +1180,7 @@
                 self.$target.carousel(+$(this).data('slide-to')); });
 
             this.$target.attr('contentEditable', 'false');
-            this.$target.find('.oe_structure, blockquote').attr('contentEditable', 'true');
+            this.$target.find('.oe_structure, .content>.row').attr('contentEditable', 'true');
 
             this.$target.carousel('pause');
         },
-- 
cgit v1.2.3


From ef7eef619720e0d5abaf6bea60fc4c59262ba083 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 11 Dec 2013 17:23:05 +0100
Subject: [IMP] website snippet: remove parent snippet when user delete the
 last child colmd snippet

bzr revid: chm@openerp.com-20131211162305-wxzvmwsb91e4prlb
---
 addons/website/static/src/js/website.snippets.editor.js | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'addons/website/static/src/js/website.snippets.editor.js')

diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index 55a920eab28..4cf49bb962b 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -673,7 +673,7 @@
     });
 
 
-    website.snippet.styleRegistry['size'] = website.snippet.StyleEditor.extend({
+    website.snippet.styleRegistry.size = website.snippet.StyleEditor.extend({
         select: function(event, np) {
             this._super(event, np);
             this.parent.parent.cover_target(this.$overlay, this.$target);
@@ -1115,7 +1115,8 @@
             this._super();
         },
         hide_remove_button: function() {
-            this.$overlay.find('.oe_snippet_remove').toggleClass("hidden", !this.$target.siblings().length);
+            this.$overlay.find('.oe_snippet_remove').toggleClass("hidden",
+                !this.$target.siblings().length && this.$target.parents("[data-snippet-id]:first").find("[data-snippet-id='colmd']").length > 1);
         },
         onFocus : function () {
             this._super();
@@ -1131,8 +1132,13 @@
             return false;
         },
         on_remove: function () {
-            if (!this.$target.siblings().length){
-                return false;
+            if (!this.$target.siblings().length) {
+                var $parent = this.$target.parents("[data-snippet-id]:first");
+                if($parent.find("[data-snippet-id='colmd']").length > 1) {
+                    return false;
+                } else {
+                    $parent.data("snippet-editor").on_remove();
+                }
             }
             this._super();
             this.hide_remove_button();
-- 
cgit v1.2.3


From 9abcc28884688bd251c5a9de77b3afda11dcec90 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 18 Dec 2013 18:39:15 +0100
Subject: [IMP] Set EditorBar height programmatically

bzr revid: fme@openerp.com-20131218173915-ds5jeyfypbaefrqf
---
 addons/website/static/src/js/website.snippets.editor.js | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'addons/website/static/src/js/website.snippets.editor.js')

diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index 4cf49bb962b..44300b59643 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -139,6 +139,10 @@
             $(document).on('click', '.dropdown-submenu a[tabindex]', function (e) {
                 e.preventDefault();
             });
+
+            this.getParent().on('resize', this, function (height) {
+                self.$el.css('top', height);
+            });
         },
         fetch_snippet_templates: function () {
             var self = this;
-- 
cgit v1.2.3


From b180d69808e7ef16e3854ef347cc8aa57eca718f Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 18 Dec 2013 21:16:19 +0100
Subject: [IMP] Better events naming for EditorBar height related stuff

bzr revid: fme@openerp.com-20131218201619-vja6dv0sctokep3b
---
 addons/website/static/src/js/website.snippets.editor.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/website/static/src/js/website.snippets.editor.js')

diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index 44300b59643..d4f8920663a 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -140,8 +140,8 @@
                 e.preventDefault();
             });
 
-            this.getParent().on('resize', this, function (height) {
-                self.$el.css('top', height);
+            this.getParent().on('change:height', this, function (editor) {
+                self.$el.css('top', editor.get('height'));
             });
         },
         fetch_snippet_templates: function () {
-- 
cgit v1.2.3