From dff6d399dc820a805aa8938e97fc947ec0e9b40f Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Mon, 16 Sep 2013 14:32:57 +0200 Subject: [PATCH] [IMP] website: snippet: rename chils to children bzr revid: chm@openerp.com-20130916123257-h9g7tpszs4mzlxxl --- .../website/static/src/js/website.snippets.js | 18 ++++++------- .../static/src/xml/website.snippets.xml | 26 +++++++++---------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/addons/website/static/src/js/website.snippets.js b/addons/website/static/src/js/website.snippets.js index e9338fa1e92..d1d13108b96 100644 --- a/addons/website/static/src/js/website.snippets.js +++ b/addons/website/static/src/js/website.snippets.js @@ -219,15 +219,15 @@ var action = $snippet.find('.oe_snippet_body').size() ? 'insert' : 'mutate'; if( action === 'insert'){ - if (!$snippet.data('selector-siblings') && !$snippet.data('selector-childs') && !$snippet.data('selector-vertical-childs')) { + 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-childs or data-selector-vertical-childs tag for mutate 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'), - childs: $snippet.data('selector-childs'), - vertical_childs: $snippet.data('selector-vertical-childs') + children: $snippet.data('selector-children'), + vertical_children: $snippet.data('selector-vertical-children') }); } else if( action === 'mutate' ){ @@ -308,15 +308,15 @@ }, // Create element insertion drop zones. two css selectors can be provided - // selector.childs -> will insert drop zones as direct child of the selected elements + // 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.childs; + var child_selector = selector.children; var sibling_selector = selector.siblings; - var vertical_child_selector = selector.vertical_childs; + var vertical_child_selector = selector.vertical_children; var zone_template = "
"; @@ -523,8 +523,8 @@ self.$target.css("display", "none"); self.parent.activate_insertion_zones({ siblings: self.$el ? self.$el.data('selector-siblings') : false, - childs: self.$el ? self.$el.data('selector-childs') : false, - vertical_childs: self.$el ? self.$el.data('selector-vertical-childs') : 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'); $('.oe_drop_zone').droppable({ diff --git a/addons/website/static/src/xml/website.snippets.xml b/addons/website/static/src/xml/website.snippets.xml index 6c1904b629b..007429ee89e 100644 --- a/addons/website/static/src/xml/website.snippets.xml +++ b/addons/website/static/src/xml/website.snippets.xml @@ -18,13 +18,13 @@
Margin resize
-
+
Column
-
+
  • @@ -134,12 +134,12 @@
  • -
    +
    Surprise!
    -
    +
    Title
    @@ -151,7 +151,7 @@
    -
    +
    Text-Image
    @@ -178,7 +178,7 @@
    -
    +
    Image-Text
    @@ -204,7 +204,7 @@
    -
    +
    Jumbotron
    @@ -221,7 +221,7 @@
    -
    +
    Text Block
    @@ -250,7 +250,7 @@
    -
    +
    Big Picture
    @@ -281,7 +281,7 @@
    -
    +
    Three Columns
    @@ -333,7 +333,7 @@
    -
    +
    Image Gallery
    @@ -371,7 +371,7 @@
    -
    +
    Comparisons
    @@ -473,7 +473,7 @@
    -
    +
    Call-to-actions