Changeset 1212

Show
Ignore:
Timestamp:
2007-12-15 12:01:35 (10 months ago)
Author:
fredck
Message:

Update this branch with trunk r1211.

Location:
FCKeditor/branches/features/floating_dialog
Files:
12 modified

Legend:

Unmodified
Added
Removed

  • FCKeditor/branches/features/floating_dialog/_dev/build_release.bat

    r1184 r1212  
    2626 
    2727:: Update this variable for each new release. 
    28 SET RELEASER_VERSION=2.6 (SVN) 
     28SET RELEASER_VERSION=2.5.1 (SVN) 
    2929 
    3030CLS 

  • FCKeditor/branches/features/floating_dialog/editor/dtd/fck_xhtml10strict.js

    r774 r1212  
    1 /* 
     1/* 
    22 * FCKeditor - The text editor for Internet - http://www.fckeditor.net 
    33 * Copyright (C) 2003-2007 Frederico Caldeira Knabben 
    … …  
    2424FCK.DTD = (function() 
    2525{ 
    26     X = FCKTools.Merge ; 
     26    var X = FCKTools.Merge ; 
    2727 
    2828    var H,I,J,K,C,L,M,A,B,D,E,G,N,F ; 

  • FCKeditor/branches/features/floating_dialog/editor/dtd/fck_xhtml10transitional.js

    r774 r1212  
    1 /* 
     1/* 
    22 * FCKeditor - The text editor for Internet - http://www.fckeditor.net 
    33 * Copyright (C) 2003-2007 Frederico Caldeira Knabben 
    … …  
    2424FCK.DTD = (function() 
    2525{ 
    26     X = FCKTools.Merge ; 
     26    var X = FCKTools.Merge ; 
    2727 
    2828    var A,L,J,M,N,O,D,H,P,K,Q,F,G,C,B,E,I ; 

  • FCKeditor/branches/features/floating_dialog/editor/filemanager/connectors/aspx/connector.aspx

    r413 r1212  
    1 <%@ Page language="c#" Trace="false" Inherits="FredCK.FCKeditorV2.FileBrowserConnector" AutoEventWireup="false" %> 
     1<%@ Page Language="c#" Trace="false" Inherits="FredCK.FCKeditorV2.FileBrowser.Connector" AutoEventWireup="false" %> 
     2<%@ Register Src="config.ascx" TagName="Config" TagPrefix="FCKeditor" %> 
    23<%-- 
    34 * FCKeditor - The text editor for Internet - http://www.fckeditor.net 
    … …  
    2930 * http://www.fckeditor.net 
    3031--%> 
     32<FCKeditor:Config id="Config" runat="server"></FCKeditor:Config> 

  • FCKeditor/branches/features/floating_dialog/editor/filemanager/connectors/aspx/upload.aspx

    r413 r1212  
    1 <%@ Page language="c#" Trace="false" Inherits="FredCK.FCKeditorV2.Uploader" AutoEventWireup="false" %> 
     1<%@ Page Language="c#" Trace="false" Inherits="FredCK.FCKeditorV2.FileBrowser.Uploader" AutoEventWireup="false" %> 
     2<%@ Register Src="config.ascx" TagName="Config" TagPrefix="FCKeditor" %> 
    23<%-- 
    34 * FCKeditor - The text editor for Internet - http://www.fckeditor.net 
    … …  
    2930 * http://www.fckeditor.net 
    3031--%> 
     32<FCKeditor:Config id="Config" runat="server"></FCKeditor:Config> 

  • FCKeditor/branches/features/floating_dialog/editor/_source/classes/fckcontextmenu.js

    r878 r1212  
    157157                } 
    158158        } 
     159        return true ; 
    159160} 
    160161 

  • FCKeditor/branches/features/floating_dialog/editor/_source/classes/fckdomrange.js

    r1184 r1212  
    100100                        return docFrag ; 
    101101                } 
     102                return null ; 
    102103        }, 
    103104 
    … …  
    106107                if ( this._Range ) 
    107108                        return this._Range.collapsed ; 
     109 
     110                return false ; 
    108111        }, 
    109112 

  • FCKeditor/branches/features/floating_dialog/editor/_source/classes/fcktoolbarspecialcombo.js

    r714 r1212  
    3333        this.SourceView                 = false ; 
    3434        this.ContextSensitive   = true ; 
     35        this.FieldWidth                 = null ; 
     36        this.PanelWidth                 = null ; 
     37        this.PanelMaxHeight             = null ; 
    3538        //this._LastValue                       = null ; 
    3639} 

  • FCKeditor/branches/features/floating_dialog/editor/_source/commandclasses/fckjustifycommands.js

    r969 r1212  
    4040                        { 
    4141                                case 'left' : 
    42                                         return classes[0] ; 
     42                                        return classes[0] || null ; 
    4343                                case 'center' : 
    44                                         return classes[1] ; 
     44                                        return classes[1] || null ; 
    4545                                case 'right' : 
    46                                         return classes[2] ; 
     46                                        return classes[2] || null ; 
    4747                                case 'justify' : 
    48                                         return classes[3] ; 
     48                                        return classes[3] || null ; 
    4949                        } 
    5050                } 

  • FCKeditor/branches/features/floating_dialog/editor/_source/internals/fck.js

    r1209 r1212  
    477477        }, 
    478478 
    479         // For the FocusManager 
    480         HasFocus : false, 
    481  
    482  
    483479        // This collection is used by the browser specific implementations to tell 
    484480        // which named commands must be handled separately. 

  • FCKeditor/branches/features/floating_dialog/editor/_source/internals/fckstyles.js

    r1049 r1212  
    8989                                var state = style.CheckActive( path ) ; 
    9090 
    91                                 if ( style._LastState != state ) 
     91                                if ( state != ( style._LastState || null ) ) 
    9292                                { 
    9393                                        style._LastState = state ; 

  • FCKeditor/branches/features/floating_dialog/_whatsnew.html

    r1193 r1212  
    5858                        target="_blank" href="http://dev.fckeditor.net/ticket/681">#681</a>] The SpellerPages 
    5959                        spell checker will now completely ignore the presence of HTML tags in the text.</li> 
     60                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1643">#1643</a>] Resolved 
     61                        several "strict warning" messages in Firefox when running FCKeditor.</li> 
    6062        </ul> 
    6163        <p>