From: <rob...@us...> - 2012-10-30 13:36:14
|
Revision: 43721 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=43721&view=rev Author: robertplummer Date: 2012-10-30 13:36:03 +0000 (Tue, 30 Oct 2012) Log Message: ----------- [fp/43720][FIX] Codemirror searchcursor is now in it's own util, needed for find and find & replace Modified Paths: -------------- branches/10.x/lib/codemirror_tiki/codemirror_tiki.js branches/10.x/tiki-setup.php Modified: branches/10.x/lib/codemirror_tiki/codemirror_tiki.js =================================================================== --- branches/10.x/lib/codemirror_tiki/codemirror_tiki.js 2012-10-30 13:30:30 UTC (rev 43720) +++ branches/10.x/lib/codemirror_tiki/codemirror_tiki.js 2012-10-30 13:36:03 UTC (rev 43721) @@ -603,21 +603,22 @@ return false; }, find: function(textareaEditor, val) { - if (!this.searchCursor[val]) { - this.searchCursor[val] = textareaEditor.getSearchCursor(val); - } + this.searchCursor[val] = textareaEditor.getSearchCursor(val); + if (this.searchCursor[val].findNext()) { textareaEditor.setSelection(this.searchCursor[val].from(), this.searchCursor[val].to()); } }, - searchCursor: [], + searchCursor: {}, replace: function(textareaEditor, val, replaceVal) { - if (!this.searchCursor[val]) { - this.searchCursor[val] = textareaEditor.getSearchCursor(val); - } - - while(this.searchCursor[val].findNext()) { + this.searchCursor[val] = textareaEditor.getSearchCursor(val); + + if (this.searchCursor[val].find()) { this.searchCursor[val].replace(replaceVal); + + while(this.searchCursor[val].findNext()) { + this.searchCursor[val].replace(replaceVal); + } } }, insertAt: function(textareaEditor, replaceString, perLine, blockLevel, replaceSelection) { Modified: branches/10.x/tiki-setup.php =================================================================== --- branches/10.x/tiki-setup.php 2012-10-30 13:30:30 UTC (rev 43720) +++ branches/10.x/tiki-setup.php 2012-10-30 13:36:03 UTC (rev 43721) @@ -321,6 +321,7 @@ $headerlib ->add_cssfile('lib/codemirror/lib/codemirror.css') ->add_jsfile_dependancy('lib/codemirror/lib/codemirror.js') + ->add_jsfile_dependancy('lib/codemirror/lib/util/searchcursor.js') //add tiki stuff ->add_cssfile('lib/codemirror_tiki/codemirror_tiki.css') ->add_jsfile_dependancy('lib/codemirror_tiki/codemirror_tiki.js'); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |