Changeset 968 for branches


Ignore:
Timestamp:
02/04/08 22:27:58 (11 years ago)
Author:
ray
Message:

copied changes to 0.95 branch

Location:
branches/0.95_stable
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/0.95_stable/XinhaCore.js

    r964 r968  
    143143*/ 
    144144Xinha.is_webkit  = (Xinha.agt.indexOf("applewebkit") != -1); 
     145Xinha.webkit_version = parseInt(navigator.appVersion.replace(/.*?AppleWebKit\/([\d]).*?/,'$1')); 
     146 
    145147/** Browser is Safari 
    146148@type string  
     
    164166Xinha.is_gecko  = (navigator.product == "Gecko"); 
    165167Xinha.is_real_gecko = (navigator.product == "Gecko" && !Xinha.is_webkit); 
     168Xinha.is_ff3 = Xinha.is_real_gecko && parseInt(navigator.productSub) >= 2007121016; 
     169Xinha.is_ff2 = Xinha.is_real_gecko && parseInt(navigator.productSub) < 2007121016; 
     170 
    166171/** File is opened locally opened ("file://" protocol) 
    167172 * @type string 
     
    186191    return false; 
    187192  } 
    188   return Xinha.is_gecko || (Xinha.is_opera && 0 && Xinha.opera_version >= 9.1) || Xinha.ie_version >= 5.5; 
     193  return Xinha.is_real_gecko || (Xinha.is_opera && 0 && Xinha.opera_version >= 9.1) || Xinha.ie_version >= 5.5 || Xinha.webkit_version >= 522; 
    189194}; 
    190195/** Cache result of checking for browser support 
  • branches/0.95_stable/plugins/SmartReplace/smart-replace.js

    r964 r968  
    177177                else 
    178178                { 
    179                         r.deleteContents(); 
    180                         editor.insertNodeAtSelection(document.createTextNode(' '+opening));                              
     179                        editor.insertNodeAtSelection(document.createTextNode(opening));                          
    181180                } 
    182181                editor.getSelection().collapseToEnd(); 
     
    205204                if(r.toString().match(/^ -/)) 
    206205                { 
    207                         r.deleteContents(); 
    208                         this.editor.insertNodeAtSelection(document.createTextNode(' '+String.fromCharCode(8211))); 
     206                        this.editor.insertNodeAtSelection(document.createTextNode(String.fromCharCode(8211))); 
    209207                } 
    210208                editor.getSelection().collapseToEnd(); 
Note: See TracChangeset for help on using the changeset viewer.