Changeset 8232 for branches/2.5/expressoMail1_2/js/rich_text_editor.js

Timestamp:

10/08/13 16:20:46 (11 years ago)

Author:

douglas

Message:

Ticket #0000 - Copiadas as alterações do Trunk. Versão final 2.5.1.

File:

• branches/2.5/expressoMail1_2/js/rich_text_editor.js (modified) (3 diffs)

branches/2.5/expressoMail1_2/js/rich_text_editor.js

@@ -130 +130 @@
 cRichTextEditor.prototype.getSignaturesOptions = function() {
         
-        if(RichTextEditor.signatures !== false)
-            return RichTextEditor.signatures;
+    if(RichTextEditor.signatures !== false)
+        return RichTextEditor.signatures;
                 
         var signatures = RichTextEditor.normalizerSignature(this.fromJSON( preferences.signatures ));
@@ -138 +138 @@
         for( key in signatures )
             if( !signature_types[key] )
-                signatures[key] = signatures[key].replace( /\n/g, "<br>" );
-                 
-        RichTextEditor.signatures = signatures;
-        return signatures;
-
-}
-cRichTextEditor.prototype.normalizerSignature = function(values) { 
-        var value = {};  
-        for (key in values){ 
-                value[RichTextEditor.isEncoded64(key) ? RichTextEditor.decode64(key) : key] = values[key]; 
-        } 
-        return value;
-
-} 
- 
-/*Verifica se a string input esta em Base64*/ 
-cRichTextEditor.prototype.isEncoded64 = function(input){ 
-var baseStr = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/="; 
-var encoded = true; 
-        if ( (input.length % 4) != 0) 
-                return false; 
-        for(var i=0; i<input.length; i++){ 
-                if ( baseStr.indexOf(input[i]) < 0 ){ 
-                        encoded = false; 
-                        break; 
-                } 
-        } 
-        return encoded; 
+                    signatures[key] = signatures[key].replace( /\n/g, "<br>" );
+
+    RichTextEditor.signatures = signatures;
+    return signatures;
+
+}
+cRichTextEditor.prototype.normalizerSignature = function(values) {
+
+    var value = {};
+
+    for (key in values){
+
+        value[RichTextEditor.isEncoded64(key) ? RichTextEditor.decode64(key) : key] = values[key];
+    }
+
+    return value;
+
+}
+
+/*Verifica se a string input esta em Base64*/
+cRichTextEditor.prototype.isEncoded64 = function(input){
+var baseStr = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
+var encoded = true;
+        if ( (input.length % 4) != 0)
+                return false;
+        for(var i=0; i<input.length; i++){
+                if ( baseStr.indexOf(input[i]) < 0 ){
+                        encoded = false;
+                        break;
+                }
+        }
+        return encoded;
 }
 
 cRichTextEditor.prototype.getSignatureDefault = function() {
-         
-        if(RichTextEditor.signatures === false){
-            RichTextEditor.signatures = RichTextEditor.getSignaturesOptions();
-            preferences.signature_default = preferences.signature;
-        }     
+
+    if(RichTextEditor.signatures === false){
+        RichTextEditor.signatures = RichTextEditor.getSignaturesOptions();
+        preferences.signature_default = preferences.signature;
+    }
          
-        if(!RichTextEditor.signatures || !preferences.signature_default) 
-        {
-          preferences.use_signature = "0"; //Desabilita o uso da assinatura
-          return '';
-        } 
-        if (RichTextEditor.isEncoded64(preferences.signature_default)) 
-                preferences.signature_default = RichTextEditor.decode64(preferences.signature_default); 
-        return unescape(preferences.signature_default);
-
-}
-
+    if(!RichTextEditor.signatures || !preferences.signature_default)
+    {
+      preferences.use_signature = "0"; //Desabilita o uso da assinatura
+      return '';
+    }
+        if (RichTextEditor.isEncoded64(preferences.signature_default))
+                preferences.signature_default = RichTextEditor.decode64(preferences.signature_default);
+    return unescape(preferences.signature_default);
+
+}
 
 
@@ -216 +219 @@
         {
             autoSaveControl.status[id] = true;
-            autoSaveControl.timer[id] = window.setInterval( "autoSave("+id+")" ,autosave_time);  
+            autoSaveControl.timer[id] = window.setInterval( "autoSave(\""+id+"\")" ,autosave_time);  
 
             CKEDITOR.instances[inst].document.on('keydown', function(event){