[Plone-cvs] r34638 - in sandbox/plone.app.deco/trunk/plone/app/deco: browser/javascripts tests/javascripts

[Rob G. <svn...@pl...>]

Author: robgietema
Date: Mon Mar  8 11:18:41 2010
New Revision: 34638

Modified:
   sandbox/plone.app.deco/trunk/plone/app/deco/browser/javascripts/deco.core.js
   sandbox/plone.app.deco/trunk/plone/app/deco/browser/javascripts/deco.dialog.js
   sandbox/plone.app.deco/trunk/plone/app/deco/browser/javascripts/deco.layout.js
   sandbox/plone.app.deco/trunk/plone/app/deco/tests/javascripts/core.js
   sandbox/plone.app.deco/trunk/plone/app/deco/tests/javascripts/dialog.js
   sandbox/plone.app.deco/trunk/plone/app/deco/tests/javascripts/layout.js
Log:
Updated content markup classes.

Modified: sandbox/plone.app.deco/trunk/plone/app/deco/browser/javascripts/deco.core.js
==============================================================================
--- sandbox/plone.app.deco/trunk/plone/app/deco/browser/javascripts/deco.core.js	(original)
+++ sandbox/plone.app.deco/trunk/plone/app/deco/browser/javascripts/deco.core.js	Mon Mar  8 11:18:41 2010
@@ -69,10 +69,10 @@
                     var target = $(this).attr("target");
                     var rev = $(this).attr("rev");
 
-                    // If region content, create a new div since the form data is in this panel
-                    if (target == 'region-content') {
-                        $("#region-content").before($(document.createElement("div"))
-                            .attr("id", "region-content-edit")
+                    // If content, create a new div since the form data is in this panel
+                    if (target == 'content') {
+                        $("#content").before($(document.createElement("div"))
+                            .attr("id", "content-edit")
                         );
                         target += '-edit';
                     }
@@ -103,10 +103,10 @@
                 });
 
                 // Init dialog
-                $('#region-content').decoDialog();
+                $('#content').decoDialog();
 
                 // Add toolbar div below content view and hide content view/contentActions
-                $("#region-content-edit").before($(document.createElement("div"))
+                $("#content-edit").before($(document.createElement("div"))
                     .addClass("deco-toolbar")
                 );
                 $("#content-views").hide();

Modified: sandbox/plone.app.deco/trunk/plone/app/deco/browser/javascripts/deco.dialog.js
==============================================================================
--- sandbox/plone.app.deco/trunk/plone/app/deco/browser/javascripts/deco.dialog.js	(original)
+++ sandbox/plone.app.deco/trunk/plone/app/deco/browser/javascripts/deco.dialog.js	Mon Mar  8 11:18:41 2010
@@ -45,8 +45,8 @@
             );
 
             // Clear actions
-            $(".formFields").children("input").hide();
-            $(".formFields")
+            $(".formControls").children("input").hide();
+            $(".formControls")
                 .append($(document.createElement("input"))
                     .attr({
                         'type': 'button',

Modified: sandbox/plone.app.deco/trunk/plone/app/deco/browser/javascripts/deco.layout.js
==============================================================================
--- sandbox/plone.app.deco/trunk/plone/app/deco/browser/javascripts/deco.layout.js	(original)
+++ sandbox/plone.app.deco/trunk/plone/app/deco/browser/javascripts/deco.layout.js	Mon Mar  8 11:18:41 2010
@@ -1833,8 +1833,8 @@
 
             // Add open panel tag
             id = $(this).attr("id");
-            if (id == "region-content-edit") {
-                id = "region-content";
+            if (id == "content-edit") {
+                id = "content";
             }
             body += '    <div id="' + id + '">\n';
 

Modified: sandbox/plone.app.deco/trunk/plone/app/deco/tests/javascripts/core.js
==============================================================================
--- sandbox/plone.app.deco/trunk/plone/app/deco/tests/javascripts/core.js	(original)
+++ sandbox/plone.app.deco/trunk/plone/app/deco/tests/javascripts/core.js	Mon Mar  8 11:18:41 2010
@@ -42,7 +42,7 @@
         $(document.body)
             .append(
                 $(document.createElement("div"))
-                    .attr("id", "region-content")
+                    .attr("id", "content")
             );
         $(document.body)
             .append(
@@ -52,7 +52,7 @@
         $(document.body)
             .append($(document.createElement("textarea"))
                 .attr('id', 'form-widgets-ILayout-layout')
-                .val('<html><div class="deco-panel" id="region-content">region-content text</div><div class="deco-panel" id="portal-column-one">portal-column-one text</div></html>')
+                .val('<html><div class="deco-panel" id="content">content text</div><div class="deco-panel" id="portal-column-one">portal-column-one text</div></html>')
             );
         $(document.body).append($(document.createElement("div")).attr("id", "content-views"));
         $(document.body).append($(document.createElement("div")).addClass("contentActions"));
@@ -62,8 +62,8 @@
         $.deco.executed = [];
     },
     teardown: function () {
-        $("#region-content").remove();
-        $("#region-content-edit").remove();
+        $("#content").remove();
+        $("#content-edit").remove();
         $("#portal-column-one").remove();
         $(".deco-toolbar").remove();
         $("#form-widgets-ILayout-layout").remove();
@@ -87,7 +87,7 @@
     $("#form-widgets-ILayout-layout").val('');
 
     $.deco.init({url: 'http://nohost/test/edit'});
-    equals($("#region-content").html(), "", 'Region content is still empty');
+    equals($("#content").html(), "", 'Region content is still empty');
     equals($("#portal-column-one").html(), "", 'Portal column one is still empty');
     equals($.deco.executed.indexOf("initActions") != -1, true, 'Init actions is called');
     equals($.deco.executed.indexOf("initNotify") != -1, true, 'Init notify is called');
@@ -98,10 +98,10 @@
 
     $.deco.init({url: 'http://nohost/test/edit'});
 
-    equals($("#region-content-edit").html(), "region-content text", 'Region content is populated');
+    equals($("#content-edit").html(), "content text", 'Region content is populated');
     equals($("#portal-column-one").html(), "portal-column-one text", 'Portal column one is populated');
 
-    equals($("#region-content-edit").hasClass('deco-panel'), true, 'Region content has deco-panel class');
+    equals($("#content-edit").hasClass('deco-panel'), true, 'Region content has deco-panel class');
     equals($("#portal-column-one").hasClass('deco-panel'), true, 'Portal column one has deco-panel class');
 
     equals($.deco.options.test, 1, 'Options are stored');

Modified: sandbox/plone.app.deco/trunk/plone/app/deco/tests/javascripts/dialog.js
==============================================================================
--- sandbox/plone.app.deco/trunk/plone/app/deco/tests/javascripts/dialog.js	(original)
+++ sandbox/plone.app.deco/trunk/plone/app/deco/tests/javascripts/dialog.js	Mon Mar  8 11:18:41 2010
@@ -80,7 +80,7 @@
                     .append($(document.createElement("input")))
                 )
             )
-            .attr("id", "region-content");
+            .attr("id", "content");
         $(document.body).append(dialog);
         $(document.body)
             .append($(document.createElement("div"))
@@ -89,7 +89,7 @@
         dialog.decoDialog();
     },
     teardown: function () {
-        $("#region-content").remove();
+        $("#content").remove();
         $(".deco-dialog-blocker").remove();
         $(".deco-title-tile").remove();
     }
@@ -105,11 +105,11 @@
     expect(3);
 
     // Init dialog
-    $("#region-content").find(".button-field").trigger("click");
+    $("#content").find(".button-field").trigger("click");
 
     equals($(".deco-dialog").length, 1, "Dialog added");
     equals($(".deco-dialog-blocker").length, 1, "Dialog blocker added");
-    equals($("#region-content").find("input:visible").length, 0, "Inputs are hidden");
+    equals($("#content").find("input:visible").length, 0, "Inputs are hidden");
 });
 
 test("dialog.open", function() {
@@ -135,7 +135,7 @@
 
     $.deco.dialog.close();
     equals($(".deco-dialog-blocker:visible").length, 0, "Dialog blocker removed");
-    equals($("#region-content:visible").length, 0, "Dialog removed");
+    equals($("#content:visible").length, 0, "Dialog removed");
 
     $.deco.dialog.open("field", {id: "title-field"});
 
@@ -149,7 +149,7 @@
 
     $.deco.dialog.close();
     equals($(".deco-dialog-blocker:visible").length, 0, "Dialog blocker removed");
-    equals($("#region-content:visible").length, 0, "Dialog removed");
+    equals($("#content:visible").length, 0, "Dialog removed");
 });
 
 test("dialog.openIframe", function() {

Modified: sandbox/plone.app.deco/trunk/plone/app/deco/tests/javascripts/layout.js
==============================================================================
--- sandbox/plone.app.deco/trunk/plone/app/deco/tests/javascripts/layout.js	(original)
+++ sandbox/plone.app.deco/trunk/plone/app/deco/tests/javascripts/layout.js	Mon Mar  8 11:18:41 2010
@@ -58,7 +58,7 @@
         $(document.body)
             .append(
                 $(document.createElement("div"))
-                    .attr("id", "region-content")
+                    .attr("id", "content")
                     .addClass("deco-panel")
                     .append(
                         $(document.createElement("div"))
@@ -93,8 +93,8 @@
         $.deco.executed = [];
     },
     teardown: function () {
-        $("#region-content").remove();
-        $("#region-content-edit").remove();
+        $("#content").remove();
+        $("#content-edit").remove();
         $("#portal-column-one").remove();
         $("#form-widgets-ILayout-layout").remove();
     }