From 4dad2bb1773d2e2a97f88cc7c0a178707732f3f6 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 12 Nov 2013 17:20:36 +0100
Subject: [FIX] website snippet: fix parallax; website.hr.recruitment; split
 snippet js

bzr revid: chm@openerp.com-20131112162036-neoyem1sus473tqr
---
 .../static/src/js/website.snippets.editor.js       | 1233 ++++++++++++++++++++
 1 file changed, 1233 insertions(+)
 create mode 100644 addons/website/static/src/js/website.snippets.editor.js

(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
new file mode 100644
index 00000000000..edeafbc6986
--- /dev/null
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -0,0 +1,1233 @@
+(function () {
+    'use strict';
+
+    var website = openerp.website;
+    website.add_template_file('/website/static/src/xml/website.snippets.xml');
+
+    website.EditorBar.include({
+        start: function () {
+            var self = this;
+            $("[data-oe-model]").on('click', function (event) {
+                var $this = $(event.srcElement);
+                var tag = $this[0].tagName.toLowerCase();
+                if (!(tag === 'a' || tag === "button") && !$this.parents("a, button").length) {
+                    self.$('[data-action="edit"]').parent().effect('bounce', {distance: 18, times: 5}, 250);
+                }
+            });
+            return this._super();
+        },
+        edit: function () {
+            var self = this;
+            $("body").off('click');
+            window.snippets = this.snippets = new website.snippet.BuildingBlock(this);
+            this.snippets.appendTo(this.$el);
+
+            this.on('rte:ready', this, function () {
+                self.snippets.$button.removeClass("hidden");
+                website.snippet.stop_animation();
+                website.snippet.start_animation();
+                self.trigger('rte:snippets_ready');
+            });
+
+            return this._super.apply(this, arguments);
+        },
+        save: function () {
+            this.snippets.make_active(false);
+
+            // FIXME: call clean_for_save on all snippets of the page, not only modified ones
+            // important for banner of parallax that changes data automatically.
+            this.snippets.clean_for_save();
+            remove_added_snippet_id();
+            this._super();
+        },
+    });
+
+    /* ----- SNIPPET SELECTOR ---- */
+
+    var observer = new website.Observer(function (mutations) {
+        if (!_(mutations).find(function (m) {
+                    return m.type === 'childList' && m.addedNodes.length > 0;
+                })) {
+            return;
+        }
+        hack_to_add_snippet_id()
+    });
+
+    // puts $el at the same absolute position as $target
+    function hack_to_add_snippet_id () {
+        _.each(website.snippet.selector, function (val) {
+            $(val[0]).each(function() {
+                if (!$(this).is("[data-snippet-id]") && $(this).parents("[data-oe-model]").length) {
+                    $(this).attr("data-snippet-id", val[1]);
+                }
+            });
+        });
+    }
+    function remove_added_snippet_id () {
+        _.each(website.snippet.selector, function (val) {
+            $(val[0]).each(function() {
+                if ($(this).data("snippet-id") === val[1]) {
+                    $(this).removeAttr("data-snippet-id");
+                }
+            });
+        });
+    }
+
+    $(document).ready(function() {
+        hack_to_add_snippet_id();
+    });
+
+    website.snippet.selector = [];
+    website.snippet.BuildingBlock = openerp.Widget.extend({
+        template: 'website.snippets',
+        activeSnippets: [],
+        init: function (parent) {
+            this.parent = parent;
+            this._super.apply(this, arguments);
+            if(!$('#oe_manipulators').length){
+                $("<div id='oe_manipulators'></div>").appendTo('body');
+            }
+            this.$active_snipped_id = false;
+            hack_to_add_snippet_id();
+            this.snippets = [];
+
+            observer.observe(document.body, {
+                childList: true,
+                subtree: true,
+            });
+        },
+        dom_filter: function (dom, sibling) {
+            if (typeof dom === "string") {
+                var include = "[data-oe-model]";
+                var sdom = dom.split(',');
+                dom = "";
+                _.each(sdom, function (val) {
+                    val = val.replace(/^\s+|\s+$/g, '');
+                    dom += include + " " + val + ", ";
+                    if (!sibling) {
+                        val = val.split(" ");
+                        dom += val.shift() + include + val.join(" ") + ", ";
+                    }
+                });
+                dom = dom.replace(/,\s*$/g, '');
+                return $(dom);
+            } else {
+                return (!sibling && $(dom).is("[data-oe-model]")) || $(dom).parents("[data-oe-model]").length ? $(dom) : $("");
+            }
+        },
+        start: function() {
+            var self = this;
+
+            this.$button = $(openerp.qweb.render('website.snippets_button'))
+                .prependTo(this.parent.$("#website-top-edit ul"))
+                .find("button");
+
+            this.$button.click(function () {
+                self.make_active(false);
+                self.$el.toggleClass("hidden");
+            });
+
+            this.fetch_snippet_templates();
+
+            this.bind_snippet_click_editor();
+
+            this.$el.addClass("hidden");
+
+            this.$modal = $(openerp.qweb.render('website.snippets_modal'));
+            this.$modal.appendTo("body");
+        },
+        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 $style = $(this);
+                        var snipped_id = $style.data('snippet-id');
+                        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()
+                        };
+                    });
+                    $styles.remove();
+
+                    self.$snippets = $html.find(".tab-content > div > div").addClass("oe_snippet");
+                    self.$el.append($html);
+
+                    self.make_snippet_draggable(self.$snippets);
+                });
+        },
+        cover_target: function ($el, $target){
+            var pos = $target.offset();
+            var mt = parseInt($target.css("margin-top") || 0);
+            var mb = parseInt($target.css("margin-bottom") || 0);
+            $el.css({
+                'position': 'absolute',
+                'width': $target.outerWidth(),
+                'height': $target.outerHeight() + mt + mb,
+                'top': pos.top - mt,
+                'left': pos.left
+            });
+        },
+        show: function () {
+            this.$el.removeClass("hidden");
+        },
+        hide: function () {
+            this.$el.addClass("hidden");
+        },
+
+        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);
+                    }
+                });
+        },
+        snippet_blur: function ($snipped_id) {
+            if ($snipped_id) {
+                if ($snipped_id.data("snippet-editor")) {
+                    $snipped_id.data("snippet-editor").onBlur();
+                }
+            }
+        },
+        snippet_focus: function ($snipped_id) {
+            if ($snipped_id) {
+                if ($snipped_id.data("snippet-editor")) {
+                    $snipped_id.data("snippet-editor").onFocus();
+                }
+            }
+        },
+        clean_for_save: function () {
+            for (var k in this.snippets) {
+                if (!this.snippets.hasOwnProperty(k)) { continue; }
+                var editor = $(this.snippets[k]).data("snippet-editor");
+                if (editor) {
+                    editor.clean_for_save();
+                }
+            }
+        },
+        make_active: function ($snipped_id) {
+            if ($snipped_id && this.$active_snipped_id && this.$active_snipped_id.get(0) === $snipped_id.get(0)) {
+                return;
+            }
+            if (this.$active_snipped_id) {
+                this.snippet_blur(this.$active_snipped_id);
+                this.$active_snipped_id = false;
+            }
+            if ($snipped_id) {
+                if(_.indexOf(this.snippets, $snipped_id.get(0)) === -1) {
+                    this.snippets.push($snipped_id.get(0));
+                }
+                this.$active_snipped_id = $snipped_id;
+                this.create_overlay(this.$active_snipped_id);
+                this.snippet_focus($snipped_id);
+            }
+        },
+        create_overlay: function ($snipped_id) {
+            if (typeof $snipped_id.data("snippet-editor") === 'undefined') {
+                var $targets = this.activate_overlay_zones($snipped_id);
+                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));
+            }
+            this.cover_target($snipped_id.data('overlay'), $snipped_id);
+        },
+
+        path_eval: function(path){
+            var obj = window;
+            path = path.split('.');
+            do{
+                obj = obj[path.shift()];
+            }while(path.length && obj);
+            return obj;
+        },
+
+        // activate drag and drop for the snippets in the snippet toolbar
+        make_snippet_draggable: function($snippets){
+            var self = this;
+            var $tumb = $snippets.find(".oe_snippet_thumbnail:first");
+            var left = $tumb.outerWidth()/2;
+            var top = $tumb.outerHeight()/2;
+            var $toInsert, dropped, $snippet, action, snipped_id;
+
+            $snippets.draggable({
+                greedy: true,
+                helper: 'clone',
+                zIndex: '1000',
+                appendTo: 'body',
+                cursor: "move",
+                handle: ".oe_snippet_thumbnail",
+                cursorAt: {
+                    'left': left,
+                    'top': top
+                },
+                start: function(){
+                    self.hide();
+                    dropped = false;
+                    $snippet = $(this);
+                    snipped_id = $snippet.data('snippet-id');
+                    action = $snippet.find('.oe_snippet_body').size() ? 'insert' : 'mutate';
+                    if( action === 'insert'){
+                        if (!$snippet.data('selector-siblings') && !$snippet.data('selector-children') && !$snippet.data('selector-vertical-children')) {
+                            console.debug($snippet.data("snippet-id") + " have oe_snippet_body class and have not for insert action"+
+                                "data-selector-siblings, data-selector-children or data-selector-vertical-children tag for mutate action");
+                            return;
+                        }
+                        self.activate_insertion_zones({
+                            siblings: $snippet.data('selector-siblings'),
+                            children:   $snippet.data('selector-children'),
+                            vertical_children:   $snippet.data('selector-vertical-children')
+                        });
+
+                        $toInsert = $snippet.find('.oe_snippet_body').clone();
+                        $toInsert.removeClass('oe_snippet_body');
+                        $toInsert.attr('data-snippet-id', snipped_id);
+
+                    } else if( action === 'mutate' ){
+                        if (!$snippet.data('selector')) {
+                            console.debug($snippet.data("snippet-id") + " have not oe_snippet_body class and have not data-selector tag");
+                            return;
+                        }
+                        var $targets = self.activate_overlay_zones($snippet.data('selector'));
+                        $targets.each(function(){
+                            var $clone = $(this).data('overlay').clone();
+                             $clone.addClass("oe_drop_zone").data('target', $(this));
+                            $(this).data('overlay').after($clone);
+                        });
+
+                    }
+
+                    $('.oe_drop_zone').droppable({
+                        over:   function(){
+                            if( action === 'insert'){
+                                dropped = true;
+                                $(this).first().after($toInsert);
+                            }
+                        },
+                        out:    function(){
+                            if( action === 'insert'){
+                                dropped = false;
+                                $toInsert.detach();
+                            }
+                        },
+                        drop:   function(){
+                            dropped = true;
+                        },
+                    });
+                },
+                stop: function(ev, ui){
+                    if (action === 'insert' && ! dropped) {
+                        var $el = $('.oe_drop_zone').nearest({x: ui.position.left, y: ui.position.top}).first();
+                        if ($el) {
+                            $el.after($toInsert);
+                            dropped = true;
+                        }
+                    }
+
+                    $('.oe_drop_zone').droppable('destroy').remove();
+                    if (dropped) {
+                        var $target = false;
+                        if(action === 'insert'){
+                            $target = $toInsert;
+
+                            website.snippet.start_animation();
+
+                            self.create_overlay($target);
+                            $target.data("snippet-editor").drop_and_build_snippet($target);
+
+                        } else {
+                            $target = $(this).data('target');
+
+                            self.create_overlay($target);
+                            if (website.snippet.editorRegistry[snipped_id]) {
+                                var snippet = new website.snippet.editorRegistry[snipped_id](self, $target);
+                                snippet.drop_and_build_snippet($target);
+                            }
+                        }
+                        setTimeout(function () {self.make_active($target);},0);
+                    } else {
+                        $toInsert.remove();
+                        if (self.$modal.find('input:not(:checked)').length) {
+                            self.$modal.modal('toggle');
+                        }
+                    }
+                },
+            });
+        },
+
+        // return the original snippet in the editor bar from a snippet id (string)
+        get_snippet_from_id: function(id){
+            return $('.oe_snippet').filter(function(){
+                    return $(this).data('snippet-id') === id;
+                }).first();
+        },
+
+        // Create element insertion drop zones. two css selectors can be provided
+        // selector.children -> will insert drop zones as direct child of the selected elements
+        //   in case the selected elements have children themselves, dropzones will be interleaved
+        //   with them.
+        // selector.siblings -> will insert drop zones after and before selected elements
+        activate_insertion_zones: function(selector){
+            var self = this;
+            var child_selector = selector.children;
+            var sibling_selector = selector.siblings;
+            var vertical_child_selector   =  selector.vertical_children;
+
+            var zone_template = "<div class='oe_drop_zone oe_insert'></div>";
+
+            if(child_selector){
+                self.dom_filter(child_selector).each(function (){
+                    var $zone = $(this);
+                    $zone.find('> *:not(.oe_drop_zone):visible').after(zone_template);
+                    $zone.prepend(zone_template);
+                });
+            }
+
+            if(vertical_child_selector){
+                self.dom_filter(vertical_child_selector).each(function (){
+                    var $zone = $(this);
+                    var $template = $(zone_template).addClass("oe_vertical");
+                    var nb = 0;
+                    var $lastinsert = false;
+                    var left = 0;
+                    var temp_left = 0;
+                    $zone.find('> *:not(.oe_drop_zone):visible').each(function () {
+                        var $col = $(this);
+                        $template.css('height', ($col.outerHeight() + parseInt($col.css("margin-top")) + parseInt($col.css("margin-bottom")))+'px');
+                        $lastinsert = $template.clone();
+                        $(this).after($lastinsert);
+
+                        temp_left = $col.position().left;
+                        if (left === temp_left) {
+                            $col.prev(".oe_drop_zone.oe_vertical").remove();
+                            $col.before($template.clone().css("clear", "left"));
+                        }
+                        else if (!nb) {
+                            $col.before($template.clone());
+                        }
+                        left = temp_left;
+                        nb ++;
+                    });
+                    if (!nb) {
+                        $zone.prepend($template.css('height', $zone.outerHeight()+'px'));
+                    }
+                });
+            }
+
+            if(sibling_selector){
+                self.dom_filter(sibling_selector, true).each(function (){
+                    var $zone = $(this);
+                    if($zone.prev('.oe_drop_zone:visible').length === 0){
+                        $zone.before(zone_template);
+                    }
+                    if($zone.next('.oe_drop_zone:visible').length === 0){
+                        $zone.after(zone_template);
+                    }
+                });
+            }
+
+            var count;
+            do {
+                count = 0;
+                // var $zones = $('.oe_drop_zone + .oe_drop_zone');    // no two consecutive zones
+                // count += $zones.length;
+                // $zones.remove();
+
+                $zones = $('.oe_drop_zone > .oe_drop_zone:not(.oe_vertical)').remove();   // no recursive zones
+                count += $zones.length;
+                $zones.remove();
+            } while (count > 0);
+
+            // Cleaning up zones placed between floating or inline elements. We do not like these kind of zones.
+            var $zones = $('.oe_drop_zone:not(.oe_vertical)');
+            $zones.each(function (){
+                var zone = $(this);
+                var prev = zone.prev();
+                var next = zone.next();
+                var float_prev = prev.css('float')   || 'none';
+                var float_next = next.css('float')   || 'none';
+                var disp_prev  = prev.css('display') ||  null;
+                var disp_next  = next.css('display') ||  null;
+                if(     (float_prev === 'left' || float_prev === 'right')
+                    &&  (float_next === 'left' || float_next === 'right')  ){
+                    zone.remove();
+                }else if( !( disp_prev === null
+                          || disp_next === null
+                          || disp_prev === 'block'
+                          || disp_next === 'block' )){
+                    zone.remove();
+                }
+            });
+        },
+
+        // generate drop zones covering the elements selected by the selector
+        // we generate overlay drop zones only to get an idea of where the snippet are, the drop
+        activate_overlay_zones: function(selector){
+            var $targets = this.dom_filter(selector || '[data-snippet-id]');
+            var self = this;
+
+            if (typeof selector !== 'string' && !$targets.length) {
+                console.debug( "A good node must have a [data-oe-model] attribute or must have at least one parent with [data-oe-model] attribute.");
+                console.debug( "Wrong node(s): ", selector);
+            }
+
+            function is_visible($el){
+                return     $el.css('display')    != 'none'
+                        && $el.css('opacity')    != '0'
+                        && $el.css('visibility') != 'hidden';
+            }
+
+            // filter out invisible elements
+            $targets = $targets.filter(function(){ return is_visible($(this)); });
+
+            // filter out elements with invisible parents
+            $targets = $targets.filter(function(){
+                var parents = $(this).parents().filter(function(){ return !is_visible($(this)); });
+                return parents.length === 0;
+            });
+
+            $targets.each(function () {
+                var $target = $(this);
+                if (!$target.data('overlay')) {
+                    var $zone = $(openerp.qweb.render('website.snippet_overlay'));
+                    $zone.appendTo('#oe_manipulators');
+                    $zone.data('target',$target);
+                    $target.data('overlay',$zone);
+
+                    $target.on("DOMNodeInserted DOMNodeRemoved DOMSubtreeModified", function () {
+                        self.cover_target($zone, $target);
+                    });
+                    $('body').on("resize", function () {
+                        self.cover_target($zone, $target);
+                    });
+                }
+                self.cover_target($target.data('overlay'), $target);
+            });
+            return $targets;
+        }
+    });
+
+
+    website.snippet.editorRegistry = {};
+    website.snippet.Editor = openerp.Class.extend({
+        init: function (parent, dom) {
+            this.parent = parent;
+            this.$target = $(dom);
+            this.$overlay = this.$target.data('overlay');
+            this.snippet_id = this.$target.data("snippet-id");
+            this._readXMLData();
+            this.load_style_options();
+            this.get_parent_block();
+            this.start();
+        },
+
+        /*
+        *  _readXMLData
+        *  Read data XML and set value into:
+        *  this.$el :
+        *       all xml data
+        *  this.$overlay :
+        *       Dom hover the $target who content options
+        *  this.$editor :
+        *       content of .oe_snippet_options
+        *       Displayed into the overlay options on focus
+        */
+        _readXMLData: function() {
+            var self = this;
+            this.$el = this.parent.$snippets.filter(function () { return $(this).data("snippet-id") == self.snippet_id; }).clone();
+            this.$editor = this.$el.find(".oe_snippet_options");
+            var $options = this.$overlay.find(".oe_overlay_options");
+            this.$editor.prependTo($options.find(".oe_options ul"));
+            if ($options.find(".oe_options ul li").length) {
+                $options.find(".oe_options").removeClass("hidden");
+            }
+        },
+
+
+        // activate drag and drop for the snippets in the snippet toolbar
+        _drag_and_drop: function(){
+            var self = this;
+            this.dropped = false;
+            this.$overlay.draggable({
+                greedy: true,
+                appendTo: 'body',
+                cursor: "move",
+                handle: ".oe_snippet_move",
+                cursorAt: {
+                    left: 18,
+                    top: 14
+                },
+                helper: function() {
+                    var $clone = $(this).clone().css({width: "24px", height: "24px", border: 0});
+                    $clone.find(".oe_overlay_options >:not(:contains(.oe_snippet_move)), .oe_handle").remove();
+                    $clone.find(":not(.glyphicon)").css({position: 'absolute', top: 0, left: 0});
+                    $clone.appendTo("body").removeClass("hidden");
+                    return $clone;
+                },
+                start: _.bind(self._drag_and_drop_start, self),
+                stop: _.bind(self._drag_and_drop_stop, self)
+            });
+        },
+        _drag_and_drop_after_insert_dropzone: function (){},
+        _drag_and_drop_active_drop_zone: function ($zones){
+            var self = this;
+            $zones.droppable({
+                over:   function(){
+                    $(".oe_drop_zone.hide").removeClass("hide");
+                    $(this).addClass("hide").first().after(self.$target);
+                    self.dropped = true;
+                },
+                out:    function(){
+                    $(this).removeClass("hide");
+                    self.$target.detach();
+                    self.dropped = false;
+                },
+            });
+        },
+        _drag_and_drop_start: function (){
+            var self = this;
+            self.parent.hide();
+            self.parent.editor_busy = true;
+            self.size = {
+                width: self.$target.width(),
+                height: self.$target.height()
+            };
+            self.$target.after("<div class='oe_drop_clone' style='display: none;'/>");
+            self.$target.detach();
+            self.$overlay.addClass("hidden");
+
+            self.parent.activate_insertion_zones({
+                siblings: self.$el ? self.$el.data('selector-siblings') : false,
+                children:   self.$el ? self.$el.data('selector-children') : false,
+                vertical_children: self.$el ? self.$el.data('selector-vertical-children') : false,
+            });
+
+            $("body").addClass('move-important');
+
+            self._drag_and_drop_after_insert_dropzone();
+            self._drag_and_drop_active_drop_zone($('.oe_drop_zone'));
+        },
+        _drag_and_drop_stop: function (){
+            var self = this;
+            if (!self.dropped) {
+                $(".oe_drop_clone").after(self.$target);
+            }
+            self.$overlay.removeClass("hidden");
+            $("body").removeClass('move-important');
+            $('.oe_drop_zone').droppable('destroy').remove();
+            $(".oe_drop_clone, .oe_drop_to_remove").remove();
+            self.parent.editor_busy = false;
+            self.get_parent_block();
+            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');
+            var $ul = $styles.find('ul:first');
+            _.each(this.parent.style_templates, 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));
+                $ul.append($li);
+                if (self.$target.hasClass( "oe_snippet_" + $li.data("snipped-id") )) {
+                    $li.addClass("active");
+                }
+                $styles.removeClass("hidden");
+            });
+            $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);
+            }
+            $li.toggleClass("active");
+        },
+
+        get_parent_block: function () {
+            var self = this;
+            var $button = this.$overlay.find('.oe_snippet_parent');
+            var $parent = this.$target.parents("[data-snippet-id]:first");
+            if ($parent.length) {
+                $button.removeClass("hidden");
+                $button.off("click").on('click', function (event) {
+                    event.preventDefault();
+                    setTimeout(function () {
+                        self.parent.make_active($parent);
+                    }, 0);
+                });
+            } else {
+                $button.addClass("hidden");
+            }
+        },
+
+        /*
+        *  start
+        *  This method is called after init and _readXMLData
+        */
+        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._drag_and_drop();
+            this._clone();
+        },
+
+        /*
+        *  drop_and_build_snippet
+        *  This method is called just after that a thumbnail is drag and dropped into a drop zone
+        *  (after the insertion of this.$body, if this.$body exists)
+        */
+        drop_and_build_snippet: function ($target) {
+        },
+
+        /* onFocus
+        *  This method is called when the user click inside the snippet in the dom
+        */
+        onFocus : function () {
+            this.$overlay.addClass('oe_active');
+        },
+
+        /* onFocus
+        *  This method is called when the user click outside the snippet in the dom, after a focus
+        */
+        onBlur : function () {
+            this.$overlay.removeClass('oe_active');
+        },
+
+        /* clean_for_save
+        *  function called just before save vue
+        */
+        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\(['"]*|['"]*\)/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);
+            }
+        },
+    });
+
+
+    website.snippet.editorRegistry.resize = website.snippet.Editor.extend({
+        start: function () {
+            var self = this;
+            this._super();
+            var $box = $(openerp.qweb.render("website.snippets.resize"));
+
+            var resize_values = this.getSize();
+            if (!resize_values.n) $box.find(".oe_handle.n").remove();
+            if (!resize_values.s) $box.find(".oe_handle.s").remove();
+            if (!resize_values.e) $box.find(".oe_handle.e").remove();
+            if (!resize_values.w) $box.find(".oe_handle.w").remove();
+
+            this.$overlay.append($box.find(".oe_handles").html());
+
+            this.$overlay.find(".oe_handle").on('mousedown', function (event){
+                    event.preventDefault();
+
+                    var $handle = $(this);
+
+                    var resize_values = self.getSize();
+                    var compass = false;
+                    var XY = false;
+                    if ($handle.hasClass('n')) {
+                        compass = 'n';
+                        XY = 'Y';
+                    }
+                    else if ($handle.hasClass('s')) {
+                        compass = 's';
+                        XY = 'Y';
+                    }
+                    else if ($handle.hasClass('e')) {
+                        compass = 'e';
+                        XY = 'X';
+                    }
+                    else if ($handle.hasClass('w')) {
+                        compass = 'w';
+                        XY = 'X';
+                    }
+
+                    var resize = resize_values[compass];
+                    if (!resize) return;
+
+                    var current = resize[2] || 0;
+                    _.each(resize[0], function (val, key) {
+                        if (self.$target.hasClass(val)) {
+                            current = key;
+                        }
+                    });
+
+                    self.parent.editor_busy = true;
+
+                    var xy = event['page'+XY];
+                    var begin = current;
+                    var beginClass = self.$target.attr("class");
+                    var regClass = new RegExp("\\s*" + resize[0][begin].replace(/[-]*[0-9]+/, '[-]*[0-9]+'), 'g');
+
+                    var cursor = $handle.css("cursor")+'-important';
+                    var $body = $(document.body);
+                    $body.addClass(cursor);
+
+                    var body_mousemove = function (event){
+                        event.preventDefault();
+                        var dd = event['page'+XY] - xy + resize[1][begin];
+                        var next = current+1 === resize[1].length ? current : (current+1);
+                        var prev = current ? (current-1) : 0;
+
+                        var change = false;
+                        if (dd > (2*resize[1][next] + resize[1][current])/3) {
+                            self.$target.attr("class", (self.$target.attr("class")||'').replace(regClass, ''));
+                            self.$target.addClass(resize[0][next]);
+                            current = next;
+                            change = true;
+                        }
+                        if (prev != current && dd < (2*resize[1][prev] + resize[1][current])/3) {
+                            self.$target.attr("class", (self.$target.attr("class")||'').replace(regClass, ''));
+                            self.$target.addClass(resize[0][prev]);
+                            current = prev;
+                            change = true;
+                        }
+
+                        if (change) {
+                            self.on_resize(compass, beginClass, current);
+                            self.parent.cover_target(self.$overlay, self.$target);
+                        }
+                    };
+
+                    var body_mouseup = function(){
+                        $body.unbind('mousemove', body_mousemove);
+                        $body.unbind('mouseup', body_mouseup);
+                        $body.removeClass(cursor);
+                        self.parent.editor_busy = false;
+                    };
+                    $body.mousemove(body_mousemove);
+                    $body.mouseup(body_mouseup);
+                });
+        },
+        getSize: function () {
+            var grid = [0,4,8,16,32,48,64,92,128];
+            this.grid = {
+                n: [_.map(grid, function (v) {return 'mt'+v;}), grid],
+                s: [_.map(grid, function (v) {return 'mb'+v;}), grid]
+            };
+            return this.grid;
+        },
+
+        /* on_resize
+        *  called when the box is resizing and the class change, before the cover_target
+        *  @compass: resize direction : 'n', 's', 'e', 'w'
+        *  @beginClass: attributes class at the begin
+        *  @current: curent increment in this.grid
+        */
+        on_resize: function (compass, beginClass, current) {
+
+        }
+    });
+
+    website.snippet.editorRegistry.colmd = website.snippet.editorRegistry.resize.extend({
+        getSize: function () {
+            this.grid = this._super();
+            var width = this.$target.parents(".row:first").first().outerWidth();
+
+            var grid = [1,2,3,4,5,6,7,8,9,10,11,12];
+            this.grid.e = [_.map(grid, function (v) {return 'col-md-'+v;}), _.map(grid, function (v) {return width/12*v;})];
+
+            var grid = [-12,-11,-10,-9,-8,-7,-6,-5,-4,-3,-2,-1,0,1,2,3,4,5,6,7,8,9,10,11];
+            this.grid.w = [_.map(grid, function (v) {return 'col-md-offset-'+v;}), _.map(grid, function (v) {return width/12*v;}), 12];
+
+            return this.grid;
+        },
+
+        _drag_and_drop_after_insert_dropzone: function(){
+            var self = this;
+            var $zones = $(".row:has(> .oe_drop_zone)").each(function () {
+                var $row = $(this);
+                var width = $row.innerWidth();
+                var pos = 0;
+                while (width > pos + self.size.width) {
+                    var $last = $row.find("> .oe_drop_zone:last");
+                    $last.each(function () {
+                        pos = $(this).position().left;
+                    });
+                    if (width > pos + self.size.width) {
+                        $row.append("<div class='col-md-1 oe_drop_to_remove'/>");
+                        var $add_drop = $last.clone();
+                        $row.append($add_drop);
+                        self._drag_and_drop_active_drop_zone($add_drop);
+                    }
+                }
+            });
+        },
+        _drag_and_drop_start: function () {
+            this._super();
+            this.$target.attr("class",this.$target.attr("class").replace(/\s*(col-lg-offset-|col-md-offset-)([0-9-]+)/g, ''));
+        },
+        _drag_and_drop_stop: function () {
+            this.$target.addClass("col-md-offset-" + this.$target.prevAll(".oe_drop_to_remove").length);
+            this._super();
+        },
+
+        on_resize: function (compass, beginClass, current) {
+            if (compass !== 'w')
+                return;
+
+            // don't change the right border position when we change the offset (replace col size)
+            var beginCol = Number(beginClass.match(/col-md-([0-9]+)|$/)[1] || 0);
+            var beginOffset = Number(beginClass.match(/col-md-offset-([0-9-]+)|$/)[1] || beginClass.match(/col-lg-offset-([0-9-]+)|$/)[1] || 0);
+            var offset = Number(this.grid.w[0][current].match(/col-md-offset-([0-9-]+)|$/)[1] || 0);
+            if (offset < 0) {
+                offset = 0;
+            }
+            var colSize = beginCol - (offset - beginOffset);
+            if (colSize <= 0) {
+                colSize = 1;
+                offset = beginOffset + beginCol - 1;
+            }
+            this.$target.attr("class",this.$target.attr("class").replace(/\s*(col-lg-offset-|col-md-offset-|col-md-)([0-9-]+)/g, ''));
+
+            this.$target.addClass('col-md-' + (colSize > 12 ? 12 : colSize));
+            if (offset > 0) {
+                this.$target.addClass('col-md-offset-' + offset);
+            }
+        },
+    });
+
+    website.snippet.editorRegistry.carousel = website.snippet.editorRegistry.resize.extend({
+        drop_and_build_snippet: function() {
+            var id = 0;
+            $("body .carousel").each(function () {
+                var _id = +$(this).attr("id").replace(/^myCarousel/, '');
+                if (id <= _id) {
+                    id = _id + 1;
+                }
+            });
+            this.$target.attr("id", "myCarousel" + id);
+            this.$target.find(".carousel-control").attr("href", "#myCarousel" + id);
+            this.$target.find("[data-target='#myCarousel']").attr("data-target", "#myCarousel" + id);
+
+            this.rebind_event();
+        },
+        onFocus: function () {
+            this._super();
+            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.removeAttr('contentEditable')
+                .find('.content, .carousel-image img')
+                    .removeAttr('contentEditable');
+        },
+        start : function () {
+            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.change_background(".item.active", 'ul[name="carousel-background"]');
+            this.change_style();
+            this.change_size();
+            this.set_options_style();
+            this.$target.carousel();
+
+            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();
+            });
+
+            this.rebind_event();
+        },
+        // 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');
+            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");
+            $clone.css("background-image", "url('"+ bg +"')");
+            $clone.removeClass('active').insertAfter($active);
+            this.$target.carousel().carousel(++index);
+            this.rebind_event();
+        },
+        on_remove: function (e) {
+            e.preventDefault();
+            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");
+                });
+                setTimeout(function () {
+                    new_index = index % cycle;
+                    self.$target.carousel().carousel( new_index + 1 );
+                    self.rebind_event();
+                }, 500);
+            } else {
+                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 () {
+                self.$target.data("snippet-view").set_values();
+            });
+            this.scroll();
+            this.change_size();
+        },
+        scroll: function () {
+            var self = this;
+            var $ul = this.$editor.find('ul[name="parallax-scroll"]');
+            var $li = $ul.find("li");
+            var speed = this.$target.data('scroll-background-ratio') || 0.6 ;
+            $ul.find('[data-value="' + speed + '"]').addClass('active');
+            $li.on('click', function (event) {
+                $li.removeClass("active");
+                $(this).addClass("active");
+                var speed =  $(this).data('value');
+                self.$target.attr('data-scroll-background-ratio', speed);
+                self.$target.data("snippet-view").set_values();
+                return false;
+            });
+            this.$target.data("snippet-view").set_values();
+        },
+        clean_for_save: function () {
+            this._super();
+            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"));
+                });
+        }
+    });
+
+    /*
+    * data-snippet-id automatically setted
+    * 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(['hr', 'hr']);
+
+})();
-- 
cgit v1.2.3


From f449371223ce79413bb9b5a5fe3526bd323d902c Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Fri, 15 Nov 2013 11:06:51 +0100
Subject: [IMP] Better tour naming

bzr revid: ddm@openerp.com-20131115100651-jifmv37b36v0dyya
---
 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 edeafbc6986..a63a8da39e5 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -26,7 +26,7 @@
                 self.snippets.$button.removeClass("hidden");
                 website.snippet.stop_animation();
                 website.snippet.start_animation();
-                self.trigger('rte:snippets_ready');
+                self.trigger('tour:editor_bar_loaded');
             });
 
             return this._super.apply(this, arguments);
-- 
cgit v1.2.3


From 46a967502dc1b57be613f820fc101c0a6303cb05 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sat, 16 Nov 2013 09:53:50 +0100
Subject: [FIX] drop when no dropzone, [IMP] Jobs layout

bzr revid: fp@openerp.com-20131116085350-gfrm0jn7bv3ubfz7
---
 addons/website/static/src/js/website.snippets.editor.js | 8 ++++----
 1 file changed, 4 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 a63a8da39e5..07979bfe696 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -336,10 +336,10 @@
                     });
                 },
                 stop: function(ev, ui){
-                    if (action === 'insert' && ! dropped) {
-                        var $el = $('.oe_drop_zone').nearest({x: ui.position.left, y: ui.position.top}).first();
-                        if ($el) {
-                            $el.after($toInsert);
+                    if (action === 'insert' && ! dropped && $('.oe_drop_zone')) {
+                        var el = $('.oe_drop_zone').nearest({x: ui.position.left, y: ui.position.top}).first();
+                        if (el.length) {
+                            el.after($toInsert);
                             dropped = true;
                         }
                     }
-- 
cgit v1.2.3


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


From a408924315042ae8c2c28e3831af8de7b475e9fe Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Thu, 2 Jan 2014 18:18:25 +0100
Subject: [FIX] Snippets placed below editor bar

bzr revid: ddm@openerp.com-20140102171825-208jw33qlmwj05fd
---
 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 d4f8920663a..50975a7263d 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -143,6 +143,7 @@
             this.getParent().on('change:height', this, function (editor) {
                 self.$el.css('top', editor.get('height'));
             });
+            self.$el.css('top', this.parent.get('height'));
         },
         fetch_snippet_templates: function () {
             var self = this;
-- 
cgit v1.2.3


From 3d96b4c2a38cc117068c89d55a7c2c21202752a5 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 8 Jan 2014 13:21:13 +0100
Subject: [IMP] website: snippets: add resize bar on snippet overlay; resising
 % 8px; remove size class

bzr revid: chm@openerp.com-20140108122113-d2zcyaobkahixlpa
---
 .../static/src/js/website.snippets.editor.js       | 182 ++++++++++++---------
 1 file changed, 104 insertions(+), 78 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 50975a7263d..33f38eaa6b4 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -181,6 +181,7 @@
                 'top': pos.top - mt,
                 'left': pos.left
             });
+            $el.find(".oe_handle.size").css("bottom", mb+'px');
         },
         show: function () {
             this.$el.removeClass("hidden");
@@ -678,17 +679,6 @@
     });
 
 
-    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, "");
@@ -879,7 +869,7 @@
                 }
                 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);
+                $ul.prepend(editor.$el.addClass("snippet-style-" + val['snippet-style-id']));
             });
 
             if ($ul.find("li").length) {
@@ -973,96 +963,121 @@
             if (!resize_values.s) $box.find(".oe_handle.s").remove();
             if (!resize_values.e) $box.find(".oe_handle.e").remove();
             if (!resize_values.w) $box.find(".oe_handle.w").remove();
+            if (!resize_values.size) $box.find(".oe_handle.size").remove();
 
             this.$overlay.append($box.find(".oe_handles").html());
 
             this.$overlay.find(".oe_handle").on('mousedown', function (event){
-                    event.preventDefault();
+                event.preventDefault();
 
-                    var $handle = $(this);
+                var $handle = $(this);
 
-                    var resize_values = self.getSize();
-                    var compass = false;
-                    var XY = false;
-                    if ($handle.hasClass('n')) {
-                        compass = 'n';
-                        XY = 'Y';
-                    }
-                    else if ($handle.hasClass('s')) {
-                        compass = 's';
-                        XY = 'Y';
-                    }
-                    else if ($handle.hasClass('e')) {
-                        compass = 'e';
-                        XY = 'X';
-                    }
-                    else if ($handle.hasClass('w')) {
-                        compass = 'w';
-                        XY = 'X';
-                    }
+                var resize_values = self.getSize();
+                var compass = false;
+                var XY = false;
+                if ($handle.hasClass('n')) {
+                    compass = 'n';
+                    XY = 'Y';
+                }
+                else if ($handle.hasClass('s')) {
+                    compass = 's';
+                    XY = 'Y';
+                }
+                else if ($handle.hasClass('e')) {
+                    compass = 'e';
+                    XY = 'X';
+                }
+                else if ($handle.hasClass('w')) {
+                    compass = 'w';
+                    XY = 'X';
+                }
+                else if ($handle.hasClass('size')) {
+                    compass = 'size';
+                    XY = 'Y';
+                }
 
-                    var resize = resize_values[compass];
-                    if (!resize) return;
+                var resize = resize_values[compass];
+                if (!resize) return;
 
+
+                if (compass === 'size') {
+                    var grid = resize[0];
+                    var offset = self.$target.offset().top;
+                    if (self.$target.css("background").match(/rgba\(0, 0, 0, 0\)/)) {
+                        self.$target.addClass("resize_editor_busy");
+                    }
+                } else {
+                    var xy = event['page'+XY];
                     var current = resize[2] || 0;
                     _.each(resize[0], function (val, key) {
                         if (self.$target.hasClass(val)) {
                             current = key;
                         }
                     });
-
-                    self.parent.editor_busy = true;
-
-                    var xy = event['page'+XY];
                     var begin = current;
                     var beginClass = self.$target.attr("class");
                     var regClass = new RegExp("\\s*" + resize[0][begin].replace(/[-]*[0-9]+/, '[-]*[0-9]+'), 'g');
+                }
 
-                    var cursor = $handle.css("cursor")+'-important';
-                    var $body = $(document.body);
-                    $body.addClass(cursor);
-
-                    var body_mousemove = function (event){
-                        event.preventDefault();
-                        var dd = event['page'+XY] - xy + resize[1][begin];
-                        var next = current+1 === resize[1].length ? current : (current+1);
-                        var prev = current ? (current-1) : 0;
-
-                        var change = false;
-                        if (dd > (2*resize[1][next] + resize[1][current])/3) {
-                            self.$target.attr("class", (self.$target.attr("class")||'').replace(regClass, ''));
-                            self.$target.addClass(resize[0][next]);
-                            current = next;
-                            change = true;
-                        }
-                        if (prev != current && dd < (2*resize[1][prev] + resize[1][current])/3) {
-                            self.$target.attr("class", (self.$target.attr("class")||'').replace(regClass, ''));
-                            self.$target.addClass(resize[0][prev]);
-                            current = prev;
-                            change = true;
-                        }
+                self.parent.editor_busy = true;
 
-                        if (change) {
-                            self.on_resize(compass, beginClass, current);
-                            self.parent.cover_target(self.$overlay, self.$target);
-                        }
-                    };
-
-                    var body_mouseup = function(){
-                        $body.unbind('mousemove', body_mousemove);
-                        $body.unbind('mouseup', body_mouseup);
-                        $body.removeClass(cursor);
-                        self.parent.editor_busy = false;
-                    };
-                    $body.mousemove(body_mousemove);
-                    $body.mouseup(body_mouseup);
-                });
+                var cursor = $handle.css("cursor")+'-important';
+                var $body = $(document.body);
+                $body.addClass(cursor);
+
+                var body_mousemove = function (event){
+                    event.preventDefault();
+                    if (compass === 'size') {
+                        var dy = event.pageY-offset;
+                        dy = dy - dy%resize[0];
+                        if (dy <= 0) dy = resize[0];
+                        self.$target.css("height", dy+"px");
+                        self.on_resize(compass, beginClass, current);
+                        self.parent.cover_target(self.$overlay, self.$target);
+                        return;
+                    }
+                    var dd = event['page'+XY] - xy + resize[1][begin];
+                    var next = current+1 === resize[1].length ? current : (current+1);
+                    var prev = current ? (current-1) : 0;
+
+                    var change = false;
+                    if (dd > (2*resize[1][next] + resize[1][current])/3) {
+                        self.$target.attr("class", (self.$target.attr("class")||'').replace(regClass, ''));
+                        self.$target.addClass(resize[0][next]);
+                        current = next;
+                        change = true;
+                    }
+                    if (prev != current && dd < (2*resize[1][prev] + resize[1][current])/3) {
+                        self.$target.attr("class", (self.$target.attr("class")||'').replace(regClass, ''));
+                        self.$target.addClass(resize[0][prev]);
+                        current = prev;
+                        change = true;
+                    }
+
+                    if (change) {
+                        self.on_resize(compass, beginClass, current);
+                        self.parent.cover_target(self.$overlay, self.$target);
+                    }
+                };
+
+                var body_mouseup = function(){
+                    $body.unbind('mousemove', body_mousemove);
+                    $body.unbind('mouseup', body_mouseup);
+                    $body.removeClass(cursor);
+                    self.parent.editor_busy = false;
+                    self.$target.removeClass("resize_editor_busy");
+                };
+                $body.mousemove(body_mousemove);
+                $body.mouseup(body_mouseup);
+            });
         },
         getSize: function () {
             var grid = [0,4,8,16,32,48,64,92,128];
             this.grid = {
+                // list of class (Array), grid (Array), default value (INT)
                 n: [_.map(grid, function (v) {return 'mt'+v;}), grid],
-                s: [_.map(grid, function (v) {return 'mb'+v;}), grid]
+                s: [_.map(grid, function (v) {return 'mb'+v;}), grid],
+                size: [8]
             };
             return this.grid;
         },
@@ -1089,6 +1104,8 @@
             var grid = [-12,-11,-10,-9,-8,-7,-6,-5,-4,-3,-2,-1,0,1,2,3,4,5,6,7,8,9,10,11];
             this.grid.w = [_.map(grid, function (v) {return 'col-md-offset-'+v;}), _.map(grid, function (v) {return width/12*v;}), 12];
 
+            this.grid.s = null;
+
             return this.grid;
         },
         _drag_and_drop_after_insert_dropzone: function(){
@@ -1277,6 +1294,15 @@
             this.$target.css("background-image", "");
             this.$target.removeClass(this._class);
         },
+        getSize: function () {
+            this._super();
+            //this.grid.size = null;
+            return this.grid;
+        },
+        load_style_options : function () {
+            this._super();
+            $(".snippet-style-size li[data-class='']").remove();
+        },
         start : function () {
             var self = this;
             this._super();
-- 
cgit v1.2.3


From d5bcb3b94704a31b2d69ed852d477185d94d532e Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 8 Jan 2014 15:23:15 +0100
Subject: [FIX] website/payment_acquirer: payment/adyen/return: Add
 pspReference attribute in the route method to force to have this arguments
 and hide this url from the sitemap

bzr revid: chm@openerp.com-20140108142315-nyaleejvpugfygew
---
 addons/website/static/src/js/website.snippets.editor.js | 5 -----
 1 file changed, 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 33f38eaa6b4..bbf63f742cb 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -1294,11 +1294,6 @@
             this.$target.css("background-image", "");
             this.$target.removeClass(this._class);
         },
-        getSize: function () {
-            this._super();
-            //this.grid.size = null;
-            return this.grid;
-        },
         load_style_options : function () {
             this._super();
             $(".snippet-style-size li[data-class='']").remove();
-- 
cgit v1.2.3


From 01cae7cf52a0a1a678ddbf7c284a1767f0067e1f Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 8 Jan 2014 15:50:46 +0100
Subject: [IMP] website snippet: auto hide snippet top bar when the user click
 outside

bzr revid: chm@openerp.com-20140108145046-dz4iuuve0daz7hwg
---
 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 bbf63f742cb..6c0a062125d 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -126,6 +126,9 @@
                 self.make_active(false);
                 self.$el.toggleClass("hidden");
             });
+            $("#wrapwrap").click(function () {
+                self.$el.addClass("hidden");
+            });
 
             this.fetch_snippet_templates();
 
-- 
cgit v1.2.3


From b97727701c703baad223f17db8a18435def3a9a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 13 Jan 2014 13:55:34 +0100
Subject: [IMP] [ADD] website: added base for template designer.

[ADD] website: email_template: added website_link field, a link to edit the template
directly in the website
[ADD] website_mail: added controller and page to edit templates. They are still jinja
templates editable in the website. Not qweb templates.
[ADD] website_mail: JS file and editor override to enable only certain snippets. Those
are still to add, but will be base templates for email.
[IMP] website: improved the addition of editor JS in the template header to be able
to add JS file that override the editor without having to hack everything in the
template.

bzr revid: tde@openerp.com-20140113125534-djy48pi7lf42f9ms
---
 addons/website/static/src/js/website.snippets.editor.js | 5 ++++-
 1 file changed, 4 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 6c0a062125d..ee4b0caf90e 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -148,10 +148,13 @@
             });
             self.$el.css('top', this.parent.get('height'));
         },
+        _get_snippet_url: function () {
+            return '/website/snippets';
+        },
         fetch_snippet_templates: function () {
             var self = this;
 
-            openerp.jsonRpc("/website/snippets", 'call', {})
+            openerp.jsonRpc(this._get_snippet_url(), 'call', {})
                 .then(function (html) {
                     var $html = $(html);
 
-- 
cgit v1.2.3


From fd14481dd34aab6536f11f18892a04cae726ed66 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 15 Jan 2014 13:59:23 +0100
Subject: [IMP] website snippet: create snippets.sass, imrpove css and resizing
 layout

bzr revid: chm@openerp.com-20140115125923-eggv51bsvokc7a06
---
 .../static/src/js/website.snippets.editor.js       | 29 ++++++++++++++++------
 1 file changed, 21 insertions(+), 8 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 ee4b0caf90e..28f5a887087 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -183,11 +183,11 @@
             $el.css({
                 'position': 'absolute',
                 'width': $target.outerWidth(),
-                'height': $target.outerHeight() + mt + mb,
+                'height': $target.outerHeight() + mt + mb+1,
                 'top': pos.top - mt,
                 'left': pos.left
             });
-            $el.find(".oe_handle.size").css("bottom", mb+'px');
+            $el.find(".oe_handle.size").css("bottom", (mb-7)+'px');
         },
         show: function () {
             this.$el.removeClass("hidden");
@@ -973,7 +973,7 @@
 
             this.$overlay.append($box.find(".oe_handles").html());
 
-            this.$overlay.find(".oe_handle").on('mousedown', function (event){
+            this.$overlay.find(".oe_handle:not(:has(.oe_handle_button)), .oe_handle .oe_handle_button").on('mousedown', function (event){
                 event.preventDefault();
 
                 var $handle = $(this);
@@ -1007,7 +1007,6 @@
 
 
                 if (compass === 'size') {
-                    var grid = resize[0];
                     var offset = self.$target.offset().top;
                     if (self.$target.css("background").match(/rgba\(0, 0, 0, 0\)/)) {
                         self.$target.addClass("resize_editor_busy");
@@ -1035,10 +1034,10 @@
                     event.preventDefault();
                     if (compass === 'size') {
                         var dy = event.pageY-offset;
-                        dy = dy - dy%resize[0];
-                        if (dy <= 0) dy = resize[0];
+                        dy = dy - dy%resize;
+                        if (dy <= 0) dy = resize;
                         self.$target.css("height", dy+"px");
-                        self.on_resize(compass, beginClass, current);
+                        self.on_resize(compass, null, dy);
                         self.parent.cover_target(self.$overlay, self.$target);
                         return;
                     }
@@ -1083,7 +1082,8 @@
                 // list of class (Array), grid (Array), default value (INT)
                 n: [_.map(grid, function (v) {return 'mt'+v;}), grid],
                 s: [_.map(grid, function (v) {return 'mb'+v;}), grid],
-                size: [8]
+                // INT if the user can resize the snippet (resizing per INT px)
+                size: null
             };
             return this.grid;
         },
@@ -1295,6 +1295,11 @@
     });
 
     website.snippet.editorRegistry.carousel = website.snippet.editorRegistry.slider.extend({
+        getSize: function () {
+            this.grid = this._super();
+            this.grid.size = 8;
+            return this.grid;
+        },
         clean_for_save: function () {
             this._super();
             this.$target.css("background-image", "");
@@ -1363,6 +1368,14 @@
     });
 
     website.snippet.editorRegistry.parallax = website.snippet.editorRegistry.resize.extend({
+        getSize: function () {
+            this.grid = this._super();
+            this.grid.size = 8;
+            return this.grid;
+        },
+        on_resize: function (compass, beginClass, current) {
+            this.$target.data("snippet-view").set_values();
+        },
         start : function () {
             var self = this;
             this._super();
-- 
cgit v1.2.3


From bcef910f841318a4ac96ebe96529ed9cd71bba0c Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 15 Jan 2014 15:17:56 +0100
Subject: [FIX] website editor: add attributeEditable attribute to edit an
 editing host

bzr revid: chm@openerp.com-20140115141756-4ixq240p5z1snt9h
---
 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 28f5a887087..5b89868cd2d 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -1363,6 +1363,7 @@
                 self.$target.carousel( $(this).data('slide')); });
 
             this.$target.find('.carousel-image, .content').attr('contentEditable', 'true');
+            this.$target.find('.carousel-image').attr('attributeEditable', 'true');
             this._super();
         },
     });
-- 
cgit v1.2.3


From cd12832f9e3b75c524855a9ea808dd3dab5e6472 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 15 Jan 2014 16:25:26 +0100
Subject: [IMP] product: Service (product.product_product_consultant) is
 sale_ok=False by default and overwrite in hr_timesheet to True

bzr revid: chm@openerp.com-20140115152526-dptyljv7yxdkmis0
---
 addons/website/static/src/js/website.snippets.editor.js | 2 ++
 1 file changed, 2 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 5b89868cd2d..cdaee863c61 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -954,6 +954,8 @@
         clean_for_save: function () {
             this.$target.removeAttr('contentEditable')
                 .find('*').removeAttr('contentEditable');
+            this.$target.removeAttr('attributeEditable')
+                .find('*').removeAttr('attributeEditable');
         },
     });
 
-- 
cgit v1.2.3


From 4ff74cbf9929ad41a01fd22c9e3c6050277a6214 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 16 Jan 2014 19:05:35 +0100
Subject: [IMP] website: editor menus is displayed in function of users groups
 (event, blog...)

bzr revid: chm@openerp.com-20140116180535-c736cuxn12qghiea
---
 addons/website/static/src/js/website.snippets.editor.js | 14 ++++++++++++++
 1 file changed, 14 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 cdaee863c61..e15a647da19 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -173,6 +173,14 @@
                     self.$snippets = $html.find(".tab-content > div > div").addClass("oe_snippet");
                     self.$el.append($html);
 
+
+                    var snippets = 0;
+                    self.$snippets.each(function () {
+                        if (self.snippet_have_dropzone($(this)))
+                            snippets++;
+                    });
+                    if (!snippets) self.$button.css("display", "none");
+
                     self.make_snippet_draggable(self.$snippets);
                 });
         },
@@ -196,6 +204,12 @@
             this.$el.addClass("hidden");
         },
 
+        snippet_have_dropzone: function ($snippet) {
+            return (($snippet.data('selector-siblings') && this.dom_filter($snippet.data('selector-siblings')).size() > 0) ||
+                    ($snippet.data('selector-children') && this.dom_filter($snippet.data('selector-children')).size() > 0) ||
+                    ($snippet.data('selector-vertical-children') && this.dom_filter($snippet.data('selector-vertical-children')).size() > 0));
+        },
+
         bind_snippet_click_editor: function () {
             var self = this;
             var snipped_event_flag = false;
-- 
cgit v1.2.3


From 7651b8f7002e5a7f5e6c0aa889eb752bf6412ccd Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 20 Jan 2014 12:10:42 +0100
Subject: [IMP] website snippet: activate margin bottom resizing for colmd
 snippet

bzr revid: chm@openerp.com-20140120111042-nn76p9roezqgdehr
---
 addons/website/static/src/js/website.snippets.editor.js | 2 --
 1 file changed, 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 e15a647da19..1d28df08c75 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -1126,8 +1126,6 @@
             var grid = [-12,-11,-10,-9,-8,-7,-6,-5,-4,-3,-2,-1,0,1,2,3,4,5,6,7,8,9,10,11];
             this.grid.w = [_.map(grid, function (v) {return 'col-md-offset-'+v;}), _.map(grid, function (v) {return width/12*v;}), 12];
 
-            this.grid.s = null;
-
             return this.grid;
         },
         _drag_and_drop_after_insert_dropzone: function(){
-- 
cgit v1.2.3


From 4ff1af4d01efc7b07c9ad0dc9e0f9d73b9f1e6b4 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 21 Jan 2014 13:39:12 +0100
Subject: [FIX] website: display or not editor edit button; website_sale: test
 tour;  website: contact qweb widget

bzr revid: chm@openerp.com-20140121123912-0ya4ziusj09efti3
---
 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 1d28df08c75..89f226adfae 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -76,6 +76,9 @@
         hack_to_add_snippet_id();
     });
 
+    // 'snippet-dropped' is triggered on '#oe_snippets' whith $target as attribute when a snippet is dropped
+    // 'snippet-activated' is triggered on '#oe_snippets' (and on snippet) when a snippet is activated
+
     website.snippet.styles = {};
     website.snippet.selector = [];
     website.snippet.BuildingBlock = openerp.Widget.extend({
-- 
cgit v1.2.3


From dcb6ccd7112e177520f6e8e4ecb9c123b36b56f4 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 22 Jan 2014 10:46:54 +0100
Subject: [FIX] website snippet: on_remove column create parent overlay

bzr revid: chm@openerp.com-20140122094654-mh426x5aqmyjh8pd
---
 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 89f226adfae..7bf540f9c16 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -1182,6 +1182,9 @@
                 if($parent.find("[data-snippet-id='colmd']").length > 1) {
                     return false;
                 } else {
+                    if (!$parent.data("snippet-editor")) {
+                        this.parent.create_overlay($parent);
+                    }
                     $parent.data("snippet-editor").on_remove();
                 }
             }
-- 
cgit v1.2.3


From 41210f45df94340143082782a8bb43227ce3224e Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 24 Jan 2014 10:34:21 +0100
Subject: [FIX] website snippet: When you click on the drag and drop arrow of a
 block without actually dragging, you shouldn't go to the top of the page.

bzr revid: chm@openerp.com-20140124093421-o1rhe3p44ewwek9u
---
 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 7bf540f9c16..8a3e7a4421d 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -375,7 +375,7 @@
                     });
                 },
                 stop: function(ev, ui){
-                    if (action === 'insert' && ! dropped && $('.oe_drop_zone')) {
+                    if (action === 'insert' && ! dropped && $('.oe_drop_zone') && ui.position.top > 50) {
                         var el = $('.oe_drop_zone').nearest({x: ui.position.left, y: ui.position.top}).first();
                         if (el.length) {
                             el.after($toInsert);
-- 
cgit v1.2.3