Changeset 1322

Show
Ignore:
Timestamp:
06/16/12 10:46:22 (1 year ago)
Author:
gogo
Message:

Merge correction

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • trunk/plugins/MootoolsFileManager/MootoolsFileManager.FileManager.js

    r1321 r1322  
    120120      });        
    121121    } 
    122     if(Xinha.is_ie) this.current_selection = this.editor.saveSelection(); 
     122 
    123123    if(Xinha.is_ie) this.current_selection = this.editor.saveSelection(); 
    124124    if(link) 
    … …  
    160160  var param = this.FileManagerAttributes();   
    161161  param.f_href = path; 
    162   if(Xinha.is_ie) this.editor.restoreSelection(this.current_selection);   
     162 
    163163  if(Xinha.is_ie) this.editor.restoreSelection(this.current_selection);   
    164164  if (!a)