[dradis-svn] SF.net SVN: dradis:[1933] server/branches/RB-2.5/public/javascripts/dx/ dradis.notes.NotePreviewPanel.js

[<et...@us...>]

Revision: 1933
          http://dradis.svn.sourceforge.net/dradis/?rev=1933&view=rev
Author:   etdsoft
Date:     2010-03-05 15:57:58 +0000 (Fri, 05 Mar 2010)

Log Message:
-----------
Merged /server/branches/experimental/2009-06_refactorWordExport-etd/public/javascripts/dx/dradis.notes.NotePreviewPanel.js:r1199-1206

Ensure that the PreviewPanel only tries to clear the body if it does actually
have a body (which is created on render) otherwise we may get an error the 
first time we click on the 'add note' button.

Modified Paths:
--------------
    server/branches/RB-2.5/public/javascripts/dx/dradis.notes.NotePreviewPanel.js

Property Changed:
----------------
    server/branches/RB-2.5/public/javascripts/dx/dradis.notes.NotePreviewPanel.js

Modified: server/branches/RB-2.5/public/javascripts/dx/dradis.notes.NotePreviewPanel.js
===================================================================
--- server/branches/RB-2.5/public/javascripts/dx/dradis.notes.NotePreviewPanel.js	2010-03-05 15:40:48 UTC (rev 1932)
+++ server/branches/RB-2.5/public/javascripts/dx/dradis.notes.NotePreviewPanel.js	2010-03-05 15:57:58 UTC (rev 1933)
@@ -31,8 +31,10 @@
   },
 
   // other methods/actions
-  clear:function(){ 
-    this.body.update('');
+  clear:function(){ 
+    if (this.body) {
+      this.body.update('');
+    }
   },
 
   update:function(rawText){


Property changes on: server/branches/RB-2.5/public/javascripts/dx/dradis.notes.NotePreviewPanel.js
___________________________________________________________________
Added: svn:mergeinfo
   + /server/branches/experimental/2009-06_refactorNodesTree-etd/public/javascripts/dx/dradis.notes.NotePreviewPanel.js:1175-1185
/server/branches/experimental/2009-06_refactorWordExport-etd/public/javascripts/dx/dradis.notes.NotePreviewPanel.js:1199-1206
/server/branches/experimental/2009-06_refactorWordExport_customfields-etd/public/javascripts/dx/dradis.notes.NotePreviewPanel.js:1285-1296
/server/branches/experimental/2009-10_ExtJS30-etd/public/javascripts/dx/dradis.notes.NotePreviewPanel.js:1540-1556
/server/branches/experimental/2009-12_rails2.3.5-etd/public/javascripts/dx/dradis.notes.NotePreviewPanel.js:1685-1699
/server/branches/experimental/2010-01_RedCloth_Editor-etd/public/javascripts/dx/dradis.notes.NotePreviewPanel.js:1717-1788
/server/trunk/public/javascripts/dx/dradis.notes.NotePreviewPanel.js:1919-1930


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.