Changeset 2757

Timestamp:

09/03/10 20:21:49 (17 months ago)

Author:

mattlevine

Message:

1. changing argument order in the jquery.ckeditor() calls.

Location:

branches/5.2.1/www/admin

Files:

• js/admin.js (modified) (1 diff)
• view/vArchitecture/ajax/dsp_javascript.cfm (modified) (1 diff)
• view/vArchitecture/form/dsp_tab_basic.cfm (modified) (1 diff)
• view/vEmail_Broadcaster/dsp_form.cfm (modified) (2 diffs)

branches/5.2.1/www/admin/js/admin.js

@@ -631 +631 @@
                                 } 
                                         
-                                jQuery('#' + allPageTags[i].id).ckeditor(htmlEditorOnComplete,getHTMLEditorConfig());
+                                jQuery('#' + allPageTags[i].id).ckeditor(getHTMLEditorConfig(),htmlEditorOnComplete);
                                 
                         }

branches/5.2.1/www/admin/view/vArchitecture/ajax/dsp_javascript.cfm

@@ -78 +78 @@
                 oFCKeditor.ReplaceTextarea();
              <cfelse>
-                jQuery('##summary').ckeditor(htmlEditorOnComplete,{
+                jQuery('##summary').ckeditor({
                         toolbar: 'Summary',
                         contentsCss: '#application.settingsManager.getSite(attributes.siteid).getThemeAssetPath()#/css/editor.css',
                                 defaultLanguage: '#lcase(session.rb)#',
                                 width: '100%'
-                        }
+                        },
+                        htmlEditorOnComplete
                 );
                 summaryLoaded=true;

branches/5.2.1/www/admin/view/vArchitecture/form/dsp_tab_basic.cfm

@@ -129 +129 @@
                 }
                 </script>
-                        <div class="message"><input type="button" name="Count" value="#application.rbFactory.getKeyValue(session.rb,'sitemanager.content.fields.showcontentlength')#" onclick="alertDialog(FCKeditorAPI.GetInstance('body').GetXHTML().length + ' #jsStringFormat(application.rbFactory.getKeyValue(session.rb,'sitemanager.content.fields.characters'))#'); "> #application.rbFactory.getKeyValue(session.rb,'sitemanager.content.fields.maxcharacters')#</div>
         <cfelse>
                 <textarea name="body" id="body">#HTMLEditFormat(request.contentBean.getBody())#</textarea>
                 <script type="text/javascript" language="Javascript">
                 var loadEditorCount = 0;
-                jQuery('##body').ckeditor(htmlEditorOnComplete,{
-                        toolbar:<cfif attributes.type eq 'Form'>'Form'<cfelse>'Default'</cfif>,
-                        contentsCss: '#application.settingsManager.getSite(attributes.siteid).getThemeAssetPath()#/css/editor.css',
-                        defaultLanguage: '#lcase(session.rb)#',
-                        width: '100%',
-                        height: '550',
-                        <cfif len(application.settingsManager.getSite(attributes.siteID).getGoogleAPIKey())>
-                        GoogleMaps_Key: '#application.settingsManager.getSite(attributes.siteID).getGoogleAPIKey()#'
-                        <cfelse>
-                        GoogleMaps_Key :'none'
-                        </cfif>
-                        <cfif fileExists("#expandPath(application.settingsManager.getSite(attributes.siteid).getThemeIncludePath())#/js/ckconfig.js.cfm")>
+                
+                jQuery(function()
                         {
-                        ,customConfig:'#application.settingsManager.getSite(attributes.siteid).getThemeAssetPath()#/js/ckeditor.js.cfm?EditorType=#attributes.type#';
-                        </cfif>
-                        }
-                );
+                                var config = {
+                                                toolbar:<cfif attributes.type eq 'Form'>'Form'<cfelse>'Default'</cfif>,
+                                                contentsCss: '#application.settingsManager.getSite(attributes.siteid).getThemeAssetPath()#/css/editor.css',
+                                                defaultLanguage: '#lcase(session.rb)#',
+                                                width: '100%',
+                                                height: '550',
+                                                <cfif len(application.settingsManager.getSite(attributes.siteID).getGoogleAPIKey())>
+                                                GoogleMaps_Key: '#application.settingsManager.getSite(attributes.siteID).getGoogleAPIKey()#'
+                                                <cfelse>
+                                                GoogleMaps_Key :'none'
+                                                </cfif>
+                                                <cfif fileExists("#expandPath(application.settingsManager.getSite(attributes.siteid).getThemeIncludePath())#/js/ckconfig.js.cfm")>
+                                                ,customConfig:'#application.settingsManager.getSite(attributes.siteid).getThemeAssetPath()#/js/ckeditor.js.cfm?EditorType=#attributes.type#';
+                                                </cfif>
+                                                };
+
+                                jQuery('##body').ckeditor(config,htmlEditorOnComplete);
+                        });
                 </script>
         </cfif>

branches/5.2.1/www/admin/view/vEmail_Broadcaster/dsp_form.cfm

@@ -143 +143 @@
                 <script type="text/javascript" language="Javascript">
                 var loadEditorCount = 0;
-                jQuery('##bodyHTML').ckeditor(htmlEditorOnComplete,{
+                jQuery('##bodyHTML').ckeditor({
                         toolbar:'Default',
                         contentsCss: '#application.settingsManager.getSite(attributes.siteid).getThemeAssetPath()#/css/editor_email.css',
@@ -149 +149 @@
                         width: '100%',
                         height: '400'
-                        }
+                        },
+                        htmlEditorOnComplete
                 );
                 </script>