Changeset 4884

Timestamp:

01/05/10 21:27:27 (3 years ago)

Author:

fredck

Message:

Merged trunk into branches/versions/3.1.x.

Location:

CKEditor/branches/versions/3.1.x

Files:

• . (modified) (1 prop)
• _dev/releaser/ckreleaser.release (modified) (1 prop)
• _dev/releaser/release.bat (modified) (1 prop)
• _samples/sharedspaces.html (modified) (5 diffs)
• _source/plugins/div/dialogs/div.js (modified) (1 prop)
• _source/plugins/div/plugin.js (modified) (1 prop)
• _source/plugins/showborders/plugin.js (modified) (1 prop)

CKEditor/branches/versions/3.1.x/_samples/sharedspaces.html

@@ -49 +49 @@
                                 Editor 1 (uses the shared toolbar and element path):</label><br />
                         <textarea cols="80" id="editor1" name="editor1" rows="10">&lt;p&gt;This is some &lt;strong&gt;sample text&lt;/strong&gt;. You are using &lt;a href="http://ckeditor.com/"&gt;CKEditor&lt;/a&gt;.&lt;/p&gt;</textarea>
-                        <script type="text/javascript">
-                        //<![CDATA[
-                                CKEDITOR.replace( 'editor1',
-                                        {
-                                                sharedSpaces :
-                                                {
-                                                        top : 'topSpace',
-                                                        bottom : 'bottomSpace'
-                                                },
-
-                                                // Removes the maximize plugin as it's not usable
-                                                // in a shared toolbar.
-                                                // Removes the resizer as it's not usable in a
-                                                // shared elements path.
-                                                removePlugins : 'maximize,resize'
-                                        } );
-                        //]]>
-                        </script>
                 </p>
                 <p>
@@ -72 +54 @@
                                 Editor 2 (uses the shared toolbar and element path):</label><br />
                         <textarea cols="80" id="editor2" name="editor2" rows="10">&lt;p&gt;This is some &lt;strong&gt;sample text&lt;/strong&gt;. You are using &lt;a href="http://ckeditor.com/"&gt;CKEditor&lt;/a&gt;.&lt;/p&gt;</textarea>
-                        <script type="text/javascript">
-                        //<![CDATA[
-                                CKEDITOR.replace( 'editor2',
-                                        {
-                                                sharedSpaces :
-                                                {
-                                                        top : 'topSpace',
-                                                        bottom : 'bottomSpace'
-                                                },
-
-                                                // Removes the maximize plugin as it's not usable
-                                                // in a shared toolbar.
-                                                // Removes the resizer as it's not usable in a
-                                                // shared elements path.
-                                                removePlugins : 'maximize,resize'
-                                        } );
-                        //]]>
-                        </script>
                 </p>
                 <p>
@@ -95 +59 @@
                                 Editor 3 (uses the shared toolbar only):</label><br />
                         <textarea cols="80" id="editor3" name="editor3" rows="10">&lt;p&gt;This is some &lt;strong&gt;sample text&lt;/strong&gt;. You are using &lt;a href="http://ckeditor.com/"&gt;CKEditor&lt;/a&gt;.&lt;/p&gt;</textarea>
-                        <script type="text/javascript">
-                        //<![CDATA[
-                                CKEDITOR.replace( 'editor3',
-                                        {
-                                                sharedSpaces :
-                                                {
-                                                        top : 'topSpace'
-                                                },
-
-                                                // Removes the maximize plugin as it's not usable
-                                                // in a shared toolbar.
-                                                removePlugins : 'maximize'
-                                        } );
-                        //]]>
-                        </script>
                 </p>
                 <p>
@@ -115 +64 @@
                                 Editor 4 (no shared spaces):</label><br />
                         <textarea cols="80" id="editor4" name="editor4" rows="10">&lt;p&gt;This is some &lt;strong&gt;sample text&lt;/strong&gt;. You are using &lt;a href="http://ckeditor.com/"&gt;CKEditor&lt;/a&gt;.&lt;/p&gt;</textarea>
-                        <script type="text/javascript">
-                        //<![CDATA[
-                                CKEDITOR.replace( 'editor4' );
-                        //]]>
-                        </script>
                 </p>
                 <p>
@@ -137 +81 @@
                 </p>
         </div>
+        <script type="text/javascript">
+        //<![CDATA[
+
+                // Create all editor instances at the end of the page, so we are sure
+                // that the "bottomSpace" div is available in the DOM (IE issue).
+
+                CKEDITOR.replace( 'editor1',
+                        {
+                                sharedSpaces :
+                                {
+                                        top : 'topSpace',
+                                        bottom : 'bottomSpace'
+                                },
+
+                                // Removes the maximize plugin as it's not usable
+                                // in a shared toolbar.
+                                // Removes the resizer as it's not usable in a
+                                // shared elements path.
+                                removePlugins : 'maximize,resize'
+                        } );
+
+                        CKEDITOR.replace( 'editor2',
+                                {
+                                        sharedSpaces :
+                                        {
+                                                top : 'topSpace',
+                                                bottom : 'bottomSpace'
+                                        },
+
+                                        // Removes the maximize plugin as it's not usable
+                                        // in a shared toolbar.
+                                        // Removes the resizer as it's not usable in a
+                                        // shared elements path.
+                                        removePlugins : 'maximize,resize'
+                                } );
+
+                        CKEDITOR.replace( 'editor3',
+                                {
+                                        sharedSpaces :
+                                        {
+                                                top : 'topSpace'
+                                        },
+
+                                        // Removes the maximize plugin as it's not usable
+                                        // in a shared toolbar.
+                                        removePlugins : 'maximize'
+                                } );
+
+                        CKEDITOR.replace( 'editor4' );
+        //]]>
+        </script>
 </body>
 </html>