@@ -1,6 +1,6 @@ /** * MySource Matrix Simple Edit Tools (jquery.matrix.js) -* version: 0.3.1 (JUNE-11-2009) +* version: 0.3.2 (OCT-2-2009) * Copyright (C) 2009 Nicholas Hubbard * @requires jQuery v1.3 or later * @requires Trigger or Asset configuration in MySource Matrix @@ -38,6 +38,7 @@ $.fn.matrixForm = function (options) { findCreated: '', findTarget: '', loading: '', + noFrame: false, errorArray: false, errorSource: '', errorMessage: 'Please correct the following errors:', @@ -62,7 +63,7 @@ $.fn.matrixForm = function (options) { var form_submit_class = form_submit.attr('class'); // Check to see if we are uploading a file - if (!obj.find('input:file')) { + if (!obj.find('input:file') || defaults.noFrame) { $('#sq_commit_button').removeAttr('onclick'); @@ -85,10 +86,13 @@ $.fn.matrixForm = function (options) { // Set our click function for commit button $('#' + set_click).click(function () { - $('textarea[name^="news_item"], textarea[name^="calendar_event"]').each(function () { - var textId = $(this).attr('id'); - $(this).val(eval('editor_' + textId + '.getHTML();')); - }); + // Only if we are using HTML Area + if ($("div[id*='wysiwyg_div']").length > 0) { + $('textarea[name^="news_item"], textarea[name^="calendar_event"]').each(function () { + var textId = $(this).attr('id'); + $(this).val(eval('editor_' + textId + '.getHTML();')); + }); + } // Serialize all form data var serializeForm = obj.serialize(); jquery.matrix.js a3b739a45f1035ddbe8a0db08c6305eb9bdb7f54 Nic Hubbard nic@zedsaid.com http://github.com/nnhubbard/matrix-jquery-tools/commit/679ec161bcd9ecbb788591f8553230d7bc3862da 679ec161bcd9ecbb788591f8553230d7bc3862da 2009-10-02T10:02:36-07:00 2009-10-02T10:02:36-07:00 Added new option, noFrame to matrixForm. This is to force the plugin to not use an iFrame. This can be useful with alternate WYSIWYG editors. Also, matrixFrame now checks if a Matrix WYSIWYG is being used and only tries to run the getHTML() function if it finds one. 843fc055fa85f596c1e50b0cfe7fd3f39a8faaf9 Nic Hubbard nic@zedsaid.com