Scmwebeditor-commits

Download

scmwebeditor-commits@list.nuiton.org

439 discussions

r139 - trunk/src/main/webapp
by kcardineaud＠users.nuiton.org 28 Jun '11

28 Jun '11

Author: kcardineaud Date: 2011-06-28 17:36:36 +0200 (Tue, 28 Jun 2011) New Revision: 139 Url: http://nuiton.org/repositories/revision/scmwebeditor/139 Log: Add Java mode for codemirror Modified: trunk/src/main/webapp/ModificationViewer.jsp Modified: trunk/src/main/webapp/ModificationViewer.jsp =================================================================== --- trunk/src/main/webapp/ModificationViewer.jsp 2011-06-28 12:55:36 UTC (rev 138) +++ trunk/src/main/webapp/ModificationViewer.jsp 2011-06-28 15:36:36 UTC (rev 139) @@ -22,6 +22,9 @@ <script src="codemirror-ui/lib/CodeMirror-2.1/mode/rst/rst.js"></script> <link rel="stylesheet" href="codemirror-ui/lib/CodeMirror-2.1/mode/rst/rst.css"> + <script src="codemirror-ui/lib/CodeMirror-2.1/mode/clike/clike.js"></script> + <link rel="stylesheet" href="codemirror-ui/lib/CodeMirror-2.1/mode/clike/clike.css"> + <link rel="stylesheet" href="codemirror-ui/lib/CodeMirror-2.1/theme/default.css"> <script src="codemirror-ui/lib/CodeMirror-2.1/mode/htmlmixed/htmlmixed.js"></script> @@ -78,6 +81,7 @@ <option value="javascript">Javascript</option> <option value="text/html">HTML</option> <option value="xml">XML</option> + <option value="text/x-java">JAVA</option> </select> </label> @@ -143,6 +147,13 @@ document.getElementById('language').selectedIndex=4 </script> <% + } else if(request.getAttribute("format")!=null && request.getAttribute("format").equals("java")) { + typeEditor="text/x-java"; + %> + <script type='text/javascript'> + document.getElementById('language').selectedIndex=5 + </script> + <% } } @@ -158,6 +169,7 @@ var editor = new CodeMirrorUI(textarea,uiOptions,codeMirrorOptions); </script> + <script type="text/javascript"> function changeModeBy(select){ editor.mirror.setOption("mode",select.value); @@ -170,6 +182,7 @@ } </script> + <script src="GereSession.js" type="text/javascript"></script> <script src="cancelRedirectDelete.js" type="text/javascript"></script> @@ -247,12 +260,21 @@ <input title="Exit ScmWebEditor without saving." type="button" value="Exit" name="Cancel" onclick="javascript:cancelRedirectDelete(this.form.origText, this.form.username, this.form.pw, this.form.commitMessage, this.form.ProjectUrl, this.form.scmEditorUrl);"/> - <br/><button onClick="javascript:upload_popup('uploadForm.jsp','upload');" >Upload</button> + <br/> + </div> </form> + <center> + <button onClick="javascript:upload_popup('uploadForm.jsp','upload');" >Upload</button> + </center> + <div> + </div> + + + <!-- <form method="POST" id="uploadForm" action="doUpload" enctype="multipart/form-data"> @@ -280,7 +302,8 @@ <div id="htmlcontentPreview"></div> - + + <p align="right">©2004-2009 CodeLutin</p> </body> </html>

1 0

28 Jun '11

Author: kcardineaud Date: 2011-06-28 14:55:36 +0200 (Tue, 28 Jun 2011) New Revision: 138 Url: http://nuiton.org/repositories/revision/scmwebeditor/138 Log: Add codemirror to modify files Added: trunk/src/main/webapp/codemirror-ui/ trunk/src/main/webapp/codemirror-ui/LICENSE trunk/src/main/webapp/codemirror-ui/README.md trunk/src/main/webapp/codemirror-ui/VERSION trunk/src/main/webapp/codemirror-ui/css/ trunk/src/main/webapp/codemirror-ui/css/codemirror-ui-find.css trunk/src/main/webapp/codemirror-ui/css/codemirror-ui.css trunk/src/main/webapp/codemirror-ui/images/ trunk/src/main/webapp/codemirror-ui/images/octologo.png trunk/src/main/webapp/codemirror-ui/images/silk/ trunk/src/main/webapp/codemirror-ui/images/silk/accept.png trunk/src/main/webapp/codemirror-ui/images/silk/add.png trunk/src/main/webapp/codemirror-ui/images/silk/anchor.png trunk/src/main/webapp/codemirror-ui/images/silk/application.png trunk/src/main/webapp/codemirror-ui/images/silk/application_add.png trunk/src/main/webapp/codemirror-ui/images/silk/application_cascade.png trunk/src/main/webapp/codemirror-ui/images/silk/application_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/application_double.png trunk/src/main/webapp/codemirror-ui/images/silk/application_edit.png trunk/src/main/webapp/codemirror-ui/images/silk/application_error.png trunk/src/main/webapp/codemirror-ui/images/silk/application_form.png trunk/src/main/webapp/codemirror-ui/images/silk/application_form_add.png trunk/src/main/webapp/codemirror-ui/images/silk/application_form_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/application_form_edit.png trunk/src/main/webapp/codemirror-ui/images/silk/application_form_magnify.png trunk/src/main/webapp/codemirror-ui/images/silk/application_get.png trunk/src/main/webapp/codemirror-ui/images/silk/application_go.png trunk/src/main/webapp/codemirror-ui/images/silk/application_home.png trunk/src/main/webapp/codemirror-ui/images/silk/application_key.png trunk/src/main/webapp/codemirror-ui/images/silk/application_lightning.png trunk/src/main/webapp/codemirror-ui/images/silk/application_link.png trunk/src/main/webapp/codemirror-ui/images/silk/application_osx.png trunk/src/main/webapp/codemirror-ui/images/silk/application_osx_terminal.png trunk/src/main/webapp/codemirror-ui/images/silk/application_put.png trunk/src/main/webapp/codemirror-ui/images/silk/application_side_boxes.png trunk/src/main/webapp/codemirror-ui/images/silk/application_side_contract.png trunk/src/main/webapp/codemirror-ui/images/silk/application_side_expand.png trunk/src/main/webapp/codemirror-ui/images/silk/application_side_list.png trunk/src/main/webapp/codemirror-ui/images/silk/application_side_tree.png trunk/src/main/webapp/codemirror-ui/images/silk/application_split.png trunk/src/main/webapp/codemirror-ui/images/silk/application_tile_horizontal.png trunk/src/main/webapp/codemirror-ui/images/silk/application_tile_vertical.png trunk/src/main/webapp/codemirror-ui/images/silk/application_view_columns.png trunk/src/main/webapp/codemirror-ui/images/silk/application_view_detail.png trunk/src/main/webapp/codemirror-ui/images/silk/application_view_gallery.png trunk/src/main/webapp/codemirror-ui/images/silk/application_view_icons.png trunk/src/main/webapp/codemirror-ui/images/silk/application_view_list.png trunk/src/main/webapp/codemirror-ui/images/silk/application_view_tile.png trunk/src/main/webapp/codemirror-ui/images/silk/application_xp.png trunk/src/main/webapp/codemirror-ui/images/silk/application_xp_terminal.png trunk/src/main/webapp/codemirror-ui/images/silk/arrow_branch.png trunk/src/main/webapp/codemirror-ui/images/silk/arrow_divide.png trunk/src/main/webapp/codemirror-ui/images/silk/arrow_down.png trunk/src/main/webapp/codemirror-ui/images/silk/arrow_in.png trunk/src/main/webapp/codemirror-ui/images/silk/arrow_inout.png trunk/src/main/webapp/codemirror-ui/images/silk/arrow_join.png trunk/src/main/webapp/codemirror-ui/images/silk/arrow_left.png trunk/src/main/webapp/codemirror-ui/images/silk/arrow_merge.png trunk/src/main/webapp/codemirror-ui/images/silk/arrow_out.png trunk/src/main/webapp/codemirror-ui/images/silk/arrow_out_diag.png trunk/src/main/webapp/codemirror-ui/images/silk/arrow_redo.png trunk/src/main/webapp/codemirror-ui/images/silk/arrow_refresh.png trunk/src/main/webapp/codemirror-ui/images/silk/arrow_refresh_small.png trunk/src/main/webapp/codemirror-ui/images/silk/arrow_right.png trunk/src/main/webapp/codemirror-ui/images/silk/arrow_rotate_anticlockwise.png trunk/src/main/webapp/codemirror-ui/images/silk/arrow_rotate_clockwise.png trunk/src/main/webapp/codemirror-ui/images/silk/arrow_switch.png trunk/src/main/webapp/codemirror-ui/images/silk/arrow_turn_left.png trunk/src/main/webapp/codemirror-ui/images/silk/arrow_turn_right.png trunk/src/main/webapp/codemirror-ui/images/silk/arrow_undo.png trunk/src/main/webapp/codemirror-ui/images/silk/arrow_up.png trunk/src/main/webapp/codemirror-ui/images/silk/asterisk_orange.png trunk/src/main/webapp/codemirror-ui/images/silk/asterisk_yellow.png trunk/src/main/webapp/codemirror-ui/images/silk/attach.png trunk/src/main/webapp/codemirror-ui/images/silk/award_star_add.png trunk/src/main/webapp/codemirror-ui/images/silk/award_star_bronze_1.png trunk/src/main/webapp/codemirror-ui/images/silk/award_star_bronze_2.png trunk/src/main/webapp/codemirror-ui/images/silk/award_star_bronze_3.png trunk/src/main/webapp/codemirror-ui/images/silk/award_star_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/award_star_gold_1.png trunk/src/main/webapp/codemirror-ui/images/silk/award_star_gold_2.png trunk/src/main/webapp/codemirror-ui/images/silk/award_star_gold_3.png trunk/src/main/webapp/codemirror-ui/images/silk/award_star_silver_1.png trunk/src/main/webapp/codemirror-ui/images/silk/award_star_silver_2.png trunk/src/main/webapp/codemirror-ui/images/silk/award_star_silver_3.png trunk/src/main/webapp/codemirror-ui/images/silk/basket.png trunk/src/main/webapp/codemirror-ui/images/silk/basket_add.png trunk/src/main/webapp/codemirror-ui/images/silk/basket_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/basket_edit.png trunk/src/main/webapp/codemirror-ui/images/silk/basket_error.png trunk/src/main/webapp/codemirror-ui/images/silk/basket_go.png trunk/src/main/webapp/codemirror-ui/images/silk/basket_put.png trunk/src/main/webapp/codemirror-ui/images/silk/basket_remove.png trunk/src/main/webapp/codemirror-ui/images/silk/bell.png trunk/src/main/webapp/codemirror-ui/images/silk/bell_add.png trunk/src/main/webapp/codemirror-ui/images/silk/bell_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/bell_error.png trunk/src/main/webapp/codemirror-ui/images/silk/bell_go.png trunk/src/main/webapp/codemirror-ui/images/silk/bell_link.png trunk/src/main/webapp/codemirror-ui/images/silk/bin.png trunk/src/main/webapp/codemirror-ui/images/silk/bin_closed.png trunk/src/main/webapp/codemirror-ui/images/silk/bin_empty.png trunk/src/main/webapp/codemirror-ui/images/silk/bomb.png trunk/src/main/webapp/codemirror-ui/images/silk/book.png trunk/src/main/webapp/codemirror-ui/images/silk/book_add.png trunk/src/main/webapp/codemirror-ui/images/silk/book_addresses.png trunk/src/main/webapp/codemirror-ui/images/silk/book_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/book_edit.png trunk/src/main/webapp/codemirror-ui/images/silk/book_error.png trunk/src/main/webapp/codemirror-ui/images/silk/book_go.png trunk/src/main/webapp/codemirror-ui/images/silk/book_key.png trunk/src/main/webapp/codemirror-ui/images/silk/book_link.png trunk/src/main/webapp/codemirror-ui/images/silk/book_next.png trunk/src/main/webapp/codemirror-ui/images/silk/book_open.png trunk/src/main/webapp/codemirror-ui/images/silk/book_previous.png trunk/src/main/webapp/codemirror-ui/images/silk/box.png trunk/src/main/webapp/codemirror-ui/images/silk/brick.png trunk/src/main/webapp/codemirror-ui/images/silk/brick_add.png trunk/src/main/webapp/codemirror-ui/images/silk/brick_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/brick_edit.png trunk/src/main/webapp/codemirror-ui/images/silk/brick_error.png trunk/src/main/webapp/codemirror-ui/images/silk/brick_go.png trunk/src/main/webapp/codemirror-ui/images/silk/brick_link.png trunk/src/main/webapp/codemirror-ui/images/silk/bricks.png trunk/src/main/webapp/codemirror-ui/images/silk/briefcase.png trunk/src/main/webapp/codemirror-ui/images/silk/bug.png trunk/src/main/webapp/codemirror-ui/images/silk/bug_add.png trunk/src/main/webapp/codemirror-ui/images/silk/bug_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/bug_edit.png trunk/src/main/webapp/codemirror-ui/images/silk/bug_error.png trunk/src/main/webapp/codemirror-ui/images/silk/bug_go.png trunk/src/main/webapp/codemirror-ui/images/silk/bug_link.png trunk/src/main/webapp/codemirror-ui/images/silk/building.png trunk/src/main/webapp/codemirror-ui/images/silk/building_add.png trunk/src/main/webapp/codemirror-ui/images/silk/building_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/building_edit.png trunk/src/main/webapp/codemirror-ui/images/silk/building_error.png trunk/src/main/webapp/codemirror-ui/images/silk/building_go.png trunk/src/main/webapp/codemirror-ui/images/silk/building_key.png trunk/src/main/webapp/codemirror-ui/images/silk/building_link.png trunk/src/main/webapp/codemirror-ui/images/silk/bullet_add.png trunk/src/main/webapp/codemirror-ui/images/silk/bullet_arrow_bottom.png trunk/src/main/webapp/codemirror-ui/images/silk/bullet_arrow_down.png trunk/src/main/webapp/codemirror-ui/images/silk/bullet_arrow_top.png trunk/src/main/webapp/codemirror-ui/images/silk/bullet_arrow_up.png trunk/src/main/webapp/codemirror-ui/images/silk/bullet_black.png trunk/src/main/webapp/codemirror-ui/images/silk/bullet_blue.png trunk/src/main/webapp/codemirror-ui/images/silk/bullet_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/bullet_disk.png trunk/src/main/webapp/codemirror-ui/images/silk/bullet_error.png trunk/src/main/webapp/codemirror-ui/images/silk/bullet_feed.png trunk/src/main/webapp/codemirror-ui/images/silk/bullet_go.png trunk/src/main/webapp/codemirror-ui/images/silk/bullet_green.png trunk/src/main/webapp/codemirror-ui/images/silk/bullet_key.png trunk/src/main/webapp/codemirror-ui/images/silk/bullet_orange.png trunk/src/main/webapp/codemirror-ui/images/silk/bullet_picture.png trunk/src/main/webapp/codemirror-ui/images/silk/bullet_pink.png trunk/src/main/webapp/codemirror-ui/images/silk/bullet_purple.png trunk/src/main/webapp/codemirror-ui/images/silk/bullet_red.png trunk/src/main/webapp/codemirror-ui/images/silk/bullet_star.png trunk/src/main/webapp/codemirror-ui/images/silk/bullet_toggle_minus.png trunk/src/main/webapp/codemirror-ui/images/silk/bullet_toggle_plus.png trunk/src/main/webapp/codemirror-ui/images/silk/bullet_white.png trunk/src/main/webapp/codemirror-ui/images/silk/bullet_wrench.png trunk/src/main/webapp/codemirror-ui/images/silk/bullet_yellow.png trunk/src/main/webapp/codemirror-ui/images/silk/cake.png trunk/src/main/webapp/codemirror-ui/images/silk/calculator.png trunk/src/main/webapp/codemirror-ui/images/silk/calculator_add.png trunk/src/main/webapp/codemirror-ui/images/silk/calculator_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/calculator_edit.png trunk/src/main/webapp/codemirror-ui/images/silk/calculator_error.png trunk/src/main/webapp/codemirror-ui/images/silk/calculator_link.png trunk/src/main/webapp/codemirror-ui/images/silk/calendar.png trunk/src/main/webapp/codemirror-ui/images/silk/calendar_add.png trunk/src/main/webapp/codemirror-ui/images/silk/calendar_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/calendar_edit.png trunk/src/main/webapp/codemirror-ui/images/silk/calendar_link.png trunk/src/main/webapp/codemirror-ui/images/silk/calendar_view_day.png trunk/src/main/webapp/codemirror-ui/images/silk/calendar_view_month.png trunk/src/main/webapp/codemirror-ui/images/silk/calendar_view_week.png trunk/src/main/webapp/codemirror-ui/images/silk/camera.png trunk/src/main/webapp/codemirror-ui/images/silk/camera_add.png trunk/src/main/webapp/codemirror-ui/images/silk/camera_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/camera_edit.png trunk/src/main/webapp/codemirror-ui/images/silk/camera_error.png trunk/src/main/webapp/codemirror-ui/images/silk/camera_go.png trunk/src/main/webapp/codemirror-ui/images/silk/camera_link.png trunk/src/main/webapp/codemirror-ui/images/silk/camera_small.png trunk/src/main/webapp/codemirror-ui/images/silk/cancel.png trunk/src/main/webapp/codemirror-ui/images/silk/car.png trunk/src/main/webapp/codemirror-ui/images/silk/car_add.png trunk/src/main/webapp/codemirror-ui/images/silk/car_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/cart.png trunk/src/main/webapp/codemirror-ui/images/silk/cart_add.png trunk/src/main/webapp/codemirror-ui/images/silk/cart_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/cart_edit.png trunk/src/main/webapp/codemirror-ui/images/silk/cart_error.png trunk/src/main/webapp/codemirror-ui/images/silk/cart_go.png trunk/src/main/webapp/codemirror-ui/images/silk/cart_put.png trunk/src/main/webapp/codemirror-ui/images/silk/cart_remove.png trunk/src/main/webapp/codemirror-ui/images/silk/cd.png trunk/src/main/webapp/codemirror-ui/images/silk/cd_add.png trunk/src/main/webapp/codemirror-ui/images/silk/cd_burn.png trunk/src/main/webapp/codemirror-ui/images/silk/cd_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/cd_edit.png trunk/src/main/webapp/codemirror-ui/images/silk/cd_eject.png trunk/src/main/webapp/codemirror-ui/images/silk/cd_go.png trunk/src/main/webapp/codemirror-ui/images/silk/chart_bar.png trunk/src/main/webapp/codemirror-ui/images/silk/chart_bar_add.png trunk/src/main/webapp/codemirror-ui/images/silk/chart_bar_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/chart_bar_edit.png trunk/src/main/webapp/codemirror-ui/images/silk/chart_bar_error.png trunk/src/main/webapp/codemirror-ui/images/silk/chart_bar_link.png trunk/src/main/webapp/codemirror-ui/images/silk/chart_curve.png trunk/src/main/webapp/codemirror-ui/images/silk/chart_curve_add.png trunk/src/main/webapp/codemirror-ui/images/silk/chart_curve_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/chart_curve_edit.png trunk/src/main/webapp/codemirror-ui/images/silk/chart_curve_error.png trunk/src/main/webapp/codemirror-ui/images/silk/chart_curve_go.png trunk/src/main/webapp/codemirror-ui/images/silk/chart_curve_link.png trunk/src/main/webapp/codemirror-ui/images/silk/chart_line.png trunk/src/main/webapp/codemirror-ui/images/silk/chart_line_add.png trunk/src/main/webapp/codemirror-ui/images/silk/chart_line_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/chart_line_edit.png trunk/src/main/webapp/codemirror-ui/images/silk/chart_line_error.png trunk/src/main/webapp/codemirror-ui/images/silk/chart_line_link.png trunk/src/main/webapp/codemirror-ui/images/silk/chart_organisation.png trunk/src/main/webapp/codemirror-ui/images/silk/chart_organisation_add.png trunk/src/main/webapp/codemirror-ui/images/silk/chart_organisation_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/chart_pie.png trunk/src/main/webapp/codemirror-ui/images/silk/chart_pie_add.png trunk/src/main/webapp/codemirror-ui/images/silk/chart_pie_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/chart_pie_edit.png trunk/src/main/webapp/codemirror-ui/images/silk/chart_pie_error.png trunk/src/main/webapp/codemirror-ui/images/silk/chart_pie_link.png trunk/src/main/webapp/codemirror-ui/images/silk/clock.png trunk/src/main/webapp/codemirror-ui/images/silk/clock_add.png trunk/src/main/webapp/codemirror-ui/images/silk/clock_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/clock_edit.png trunk/src/main/webapp/codemirror-ui/images/silk/clock_error.png trunk/src/main/webapp/codemirror-ui/images/silk/clock_go.png trunk/src/main/webapp/codemirror-ui/images/silk/clock_link.png trunk/src/main/webapp/codemirror-ui/images/silk/clock_pause.png trunk/src/main/webapp/codemirror-ui/images/silk/clock_play.png trunk/src/main/webapp/codemirror-ui/images/silk/clock_red.png trunk/src/main/webapp/codemirror-ui/images/silk/clock_stop.png trunk/src/main/webapp/codemirror-ui/images/silk/cog.png trunk/src/main/webapp/codemirror-ui/images/silk/cog_add.png trunk/src/main/webapp/codemirror-ui/images/silk/cog_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/cog_edit.png trunk/src/main/webapp/codemirror-ui/images/silk/cog_error.png trunk/src/main/webapp/codemirror-ui/images/silk/cog_go.png trunk/src/main/webapp/codemirror-ui/images/silk/coins.png trunk/src/main/webapp/codemirror-ui/images/silk/coins_add.png trunk/src/main/webapp/codemirror-ui/images/silk/coins_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/color_swatch.png trunk/src/main/webapp/codemirror-ui/images/silk/color_wheel.png trunk/src/main/webapp/codemirror-ui/images/silk/comment.png trunk/src/main/webapp/codemirror-ui/images/silk/comment_add.png trunk/src/main/webapp/codemirror-ui/images/silk/comment_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/comment_edit.png trunk/src/main/webapp/codemirror-ui/images/silk/comments.png trunk/src/main/webapp/codemirror-ui/images/silk/comments_add.png trunk/src/main/webapp/codemirror-ui/images/silk/comments_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/compress.png trunk/src/main/webapp/codemirror-ui/images/silk/computer.png trunk/src/main/webapp/codemirror-ui/images/silk/computer_add.png trunk/src/main/webapp/codemirror-ui/images/silk/computer_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/computer_edit.png trunk/src/main/webapp/codemirror-ui/images/silk/computer_error.png trunk/src/main/webapp/codemirror-ui/images/silk/computer_go.png trunk/src/main/webapp/codemirror-ui/images/silk/computer_key.png trunk/src/main/webapp/codemirror-ui/images/silk/computer_link.png trunk/src/main/webapp/codemirror-ui/images/silk/connect.png trunk/src/main/webapp/codemirror-ui/images/silk/contrast.png trunk/src/main/webapp/codemirror-ui/images/silk/contrast_decrease.png trunk/src/main/webapp/codemirror-ui/images/silk/contrast_high.png trunk/src/main/webapp/codemirror-ui/images/silk/contrast_increase.png trunk/src/main/webapp/codemirror-ui/images/silk/contrast_low.png trunk/src/main/webapp/codemirror-ui/images/silk/control_eject.png trunk/src/main/webapp/codemirror-ui/images/silk/control_eject_blue.png trunk/src/main/webapp/codemirror-ui/images/silk/control_end.png trunk/src/main/webapp/codemirror-ui/images/silk/control_end_blue.png trunk/src/main/webapp/codemirror-ui/images/silk/control_equalizer.png trunk/src/main/webapp/codemirror-ui/images/silk/control_equalizer_blue.png trunk/src/main/webapp/codemirror-ui/images/silk/control_fastforward.png trunk/src/main/webapp/codemirror-ui/images/silk/control_fastforward_blue.png trunk/src/main/webapp/codemirror-ui/images/silk/control_pause.png trunk/src/main/webapp/codemirror-ui/images/silk/control_pause_blue.png trunk/src/main/webapp/codemirror-ui/images/silk/control_play.png trunk/src/main/webapp/codemirror-ui/images/silk/control_play_blue.png trunk/src/main/webapp/codemirror-ui/images/silk/control_repeat.png trunk/src/main/webapp/codemirror-ui/images/silk/control_repeat_blue.png trunk/src/main/webapp/codemirror-ui/images/silk/control_rewind.png trunk/src/main/webapp/codemirror-ui/images/silk/control_rewind_blue.png trunk/src/main/webapp/codemirror-ui/images/silk/control_start.png trunk/src/main/webapp/codemirror-ui/images/silk/control_start_blue.png trunk/src/main/webapp/codemirror-ui/images/silk/control_stop.png trunk/src/main/webapp/codemirror-ui/images/silk/control_stop_blue.png trunk/src/main/webapp/codemirror-ui/images/silk/controller.png trunk/src/main/webapp/codemirror-ui/images/silk/controller_add.png trunk/src/main/webapp/codemirror-ui/images/silk/controller_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/controller_error.png trunk/src/main/webapp/codemirror-ui/images/silk/creditcards.png trunk/src/main/webapp/codemirror-ui/images/silk/cross.png trunk/src/main/webapp/codemirror-ui/images/silk/css.png trunk/src/main/webapp/codemirror-ui/images/silk/css_add.png trunk/src/main/webapp/codemirror-ui/images/silk/css_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/css_go.png trunk/src/main/webapp/codemirror-ui/images/silk/css_valid.png trunk/src/main/webapp/codemirror-ui/images/silk/cup.png trunk/src/main/webapp/codemirror-ui/images/silk/cup_add.png trunk/src/main/webapp/codemirror-ui/images/silk/cup_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/cup_edit.png trunk/src/main/webapp/codemirror-ui/images/silk/cup_error.png trunk/src/main/webapp/codemirror-ui/images/silk/cup_go.png trunk/src/main/webapp/codemirror-ui/images/silk/cup_key.png trunk/src/main/webapp/codemirror-ui/images/silk/cup_link.png trunk/src/main/webapp/codemirror-ui/images/silk/cursor.png trunk/src/main/webapp/codemirror-ui/images/silk/cut.png trunk/src/main/webapp/codemirror-ui/images/silk/cut_red.png trunk/src/main/webapp/codemirror-ui/images/silk/database.png trunk/src/main/webapp/codemirror-ui/images/silk/database_add.png trunk/src/main/webapp/codemirror-ui/images/silk/database_connect.png trunk/src/main/webapp/codemirror-ui/images/silk/database_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/database_edit.png trunk/src/main/webapp/codemirror-ui/images/silk/database_error.png trunk/src/main/webapp/codemirror-ui/images/silk/database_gear.png trunk/src/main/webapp/codemirror-ui/images/silk/database_go.png trunk/src/main/webapp/codemirror-ui/images/silk/database_key.png trunk/src/main/webapp/codemirror-ui/images/silk/database_lightning.png trunk/src/main/webapp/codemirror-ui/images/silk/database_link.png trunk/src/main/webapp/codemirror-ui/images/silk/database_refresh.png trunk/src/main/webapp/codemirror-ui/images/silk/database_save.png trunk/src/main/webapp/codemirror-ui/images/silk/database_table.png trunk/src/main/webapp/codemirror-ui/images/silk/date.png trunk/src/main/webapp/codemirror-ui/images/silk/date_add.png trunk/src/main/webapp/codemirror-ui/images/silk/date_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/date_edit.png trunk/src/main/webapp/codemirror-ui/images/silk/date_error.png trunk/src/main/webapp/codemirror-ui/images/silk/date_go.png trunk/src/main/webapp/codemirror-ui/images/silk/date_link.png trunk/src/main/webapp/codemirror-ui/images/silk/date_magnify.png trunk/src/main/webapp/codemirror-ui/images/silk/date_next.png trunk/src/main/webapp/codemirror-ui/images/silk/date_previous.png trunk/src/main/webapp/codemirror-ui/images/silk/delete.png trunk/src/main/webapp/codemirror-ui/images/silk/disconnect.png trunk/src/main/webapp/codemirror-ui/images/silk/disk.png trunk/src/main/webapp/codemirror-ui/images/silk/disk_multiple.png trunk/src/main/webapp/codemirror-ui/images/silk/door.png trunk/src/main/webapp/codemirror-ui/images/silk/door_in.png trunk/src/main/webapp/codemirror-ui/images/silk/door_open.png trunk/src/main/webapp/codemirror-ui/images/silk/door_out.png trunk/src/main/webapp/codemirror-ui/images/silk/drink.png trunk/src/main/webapp/codemirror-ui/images/silk/drink_empty.png trunk/src/main/webapp/codemirror-ui/images/silk/drive.png trunk/src/main/webapp/codemirror-ui/images/silk/drive_add.png trunk/src/main/webapp/codemirror-ui/images/silk/drive_burn.png trunk/src/main/webapp/codemirror-ui/images/silk/drive_cd.png trunk/src/main/webapp/codemirror-ui/images/silk/drive_cd_empty.png trunk/src/main/webapp/codemirror-ui/images/silk/drive_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/drive_disk.png trunk/src/main/webapp/codemirror-ui/images/silk/drive_edit.png trunk/src/main/webapp/codemirror-ui/images/silk/drive_error.png trunk/src/main/webapp/codemirror-ui/images/silk/drive_go.png trunk/src/main/webapp/codemirror-ui/images/silk/drive_key.png trunk/src/main/webapp/codemirror-ui/images/silk/drive_link.png trunk/src/main/webapp/codemirror-ui/images/silk/drive_magnify.png trunk/src/main/webapp/codemirror-ui/images/silk/drive_network.png trunk/src/main/webapp/codemirror-ui/images/silk/drive_rename.png trunk/src/main/webapp/codemirror-ui/images/silk/drive_user.png trunk/src/main/webapp/codemirror-ui/images/silk/drive_web.png trunk/src/main/webapp/codemirror-ui/images/silk/dvd.png trunk/src/main/webapp/codemirror-ui/images/silk/dvd_add.png trunk/src/main/webapp/codemirror-ui/images/silk/dvd_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/dvd_edit.png trunk/src/main/webapp/codemirror-ui/images/silk/dvd_error.png trunk/src/main/webapp/codemirror-ui/images/silk/dvd_go.png trunk/src/main/webapp/codemirror-ui/images/silk/dvd_key.png trunk/src/main/webapp/codemirror-ui/images/silk/dvd_link.png trunk/src/main/webapp/codemirror-ui/images/silk/email.png trunk/src/main/webapp/codemirror-ui/images/silk/email_add.png trunk/src/main/webapp/codemirror-ui/images/silk/email_attach.png trunk/src/main/webapp/codemirror-ui/images/silk/email_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/email_edit.png trunk/src/main/webapp/codemirror-ui/images/silk/email_error.png trunk/src/main/webapp/codemirror-ui/images/silk/email_go.png trunk/src/main/webapp/codemirror-ui/images/silk/email_link.png trunk/src/main/webapp/codemirror-ui/images/silk/email_open.png trunk/src/main/webapp/codemirror-ui/images/silk/email_open_image.png trunk/src/main/webapp/codemirror-ui/images/silk/emoticon_evilgrin.png trunk/src/main/webapp/codemirror-ui/images/silk/emoticon_grin.png trunk/src/main/webapp/codemirror-ui/images/silk/emoticon_happy.png trunk/src/main/webapp/codemirror-ui/images/silk/emoticon_smile.png trunk/src/main/webapp/codemirror-ui/images/silk/emoticon_surprised.png trunk/src/main/webapp/codemirror-ui/images/silk/emoticon_tongue.png trunk/src/main/webapp/codemirror-ui/images/silk/emoticon_unhappy.png trunk/src/main/webapp/codemirror-ui/images/silk/emoticon_waii.png trunk/src/main/webapp/codemirror-ui/images/silk/emoticon_wink.png trunk/src/main/webapp/codemirror-ui/images/silk/error.png trunk/src/main/webapp/codemirror-ui/images/silk/error_add.png trunk/src/main/webapp/codemirror-ui/images/silk/error_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/error_go.png trunk/src/main/webapp/codemirror-ui/images/silk/exclamation.png trunk/src/main/webapp/codemirror-ui/images/silk/eye.png trunk/src/main/webapp/codemirror-ui/images/silk/feed.png trunk/src/main/webapp/codemirror-ui/images/silk/feed_add.png trunk/src/main/webapp/codemirror-ui/images/silk/feed_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/feed_disk.png trunk/src/main/webapp/codemirror-ui/images/silk/feed_edit.png trunk/src/main/webapp/codemirror-ui/images/silk/feed_error.png trunk/src/main/webapp/codemirror-ui/images/silk/feed_go.png trunk/src/main/webapp/codemirror-ui/images/silk/feed_key.png trunk/src/main/webapp/codemirror-ui/images/silk/feed_link.png trunk/src/main/webapp/codemirror-ui/images/silk/feed_magnify.png trunk/src/main/webapp/codemirror-ui/images/silk/female.png trunk/src/main/webapp/codemirror-ui/images/silk/film.png trunk/src/main/webapp/codemirror-ui/images/silk/film_add.png trunk/src/main/webapp/codemirror-ui/images/silk/film_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/film_edit.png trunk/src/main/webapp/codemirror-ui/images/silk/film_error.png trunk/src/main/webapp/codemirror-ui/images/silk/film_go.png trunk/src/main/webapp/codemirror-ui/images/silk/film_key.png trunk/src/main/webapp/codemirror-ui/images/silk/film_link.png trunk/src/main/webapp/codemirror-ui/images/silk/film_save.png trunk/src/main/webapp/codemirror-ui/images/silk/find.png trunk/src/main/webapp/codemirror-ui/images/silk/flag_blue.png trunk/src/main/webapp/codemirror-ui/images/silk/flag_green.png trunk/src/main/webapp/codemirror-ui/images/silk/flag_orange.png trunk/src/main/webapp/codemirror-ui/images/silk/flag_pink.png trunk/src/main/webapp/codemirror-ui/images/silk/flag_purple.png trunk/src/main/webapp/codemirror-ui/images/silk/flag_red.png trunk/src/main/webapp/codemirror-ui/images/silk/flag_yellow.png trunk/src/main/webapp/codemirror-ui/images/silk/folder.png trunk/src/main/webapp/codemirror-ui/images/silk/folder_add.png trunk/src/main/webapp/codemirror-ui/images/silk/folder_bell.png trunk/src/main/webapp/codemirror-ui/images/silk/folder_brick.png trunk/src/main/webapp/codemirror-ui/images/silk/folder_bug.png trunk/src/main/webapp/codemirror-ui/images/silk/folder_camera.png trunk/src/main/webapp/codemirror-ui/images/silk/folder_database.png trunk/src/main/webapp/codemirror-ui/images/silk/folder_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/folder_edit.png trunk/src/main/webapp/codemirror-ui/images/silk/folder_error.png trunk/src/main/webapp/codemirror-ui/images/silk/folder_explore.png trunk/src/main/webapp/codemirror-ui/images/silk/folder_feed.png trunk/src/main/webapp/codemirror-ui/images/silk/folder_find.png trunk/src/main/webapp/codemirror-ui/images/silk/folder_go.png trunk/src/main/webapp/codemirror-ui/images/silk/folder_heart.png trunk/src/main/webapp/codemirror-ui/images/silk/folder_image.png trunk/src/main/webapp/codemirror-ui/images/silk/folder_key.png trunk/src/main/webapp/codemirror-ui/images/silk/folder_lightbulb.png trunk/src/main/webapp/codemirror-ui/images/silk/folder_link.png trunk/src/main/webapp/codemirror-ui/images/silk/folder_magnify.png trunk/src/main/webapp/codemirror-ui/images/silk/folder_page.png trunk/src/main/webapp/codemirror-ui/images/silk/folder_page_white.png trunk/src/main/webapp/codemirror-ui/images/silk/folder_palette.png trunk/src/main/webapp/codemirror-ui/images/silk/folder_picture.png trunk/src/main/webapp/codemirror-ui/images/silk/folder_star.png trunk/src/main/webapp/codemirror-ui/images/silk/folder_table.png trunk/src/main/webapp/codemirror-ui/images/silk/folder_user.png trunk/src/main/webapp/codemirror-ui/images/silk/folder_wrench.png trunk/src/main/webapp/codemirror-ui/images/silk/font.png trunk/src/main/webapp/codemirror-ui/images/silk/font_add.png trunk/src/main/webapp/codemirror-ui/images/silk/font_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/font_go.png trunk/src/main/webapp/codemirror-ui/images/silk/group.png trunk/src/main/webapp/codemirror-ui/images/silk/group_add.png trunk/src/main/webapp/codemirror-ui/images/silk/group_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/group_edit.png trunk/src/main/webapp/codemirror-ui/images/silk/group_error.png trunk/src/main/webapp/codemirror-ui/images/silk/group_gear.png trunk/src/main/webapp/codemirror-ui/images/silk/group_go.png trunk/src/main/webapp/codemirror-ui/images/silk/group_key.png trunk/src/main/webapp/codemirror-ui/images/silk/group_link.png trunk/src/main/webapp/codemirror-ui/images/silk/heart.png trunk/src/main/webapp/codemirror-ui/images/silk/heart_add.png trunk/src/main/webapp/codemirror-ui/images/silk/heart_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/help.png trunk/src/main/webapp/codemirror-ui/images/silk/hourglass.png trunk/src/main/webapp/codemirror-ui/images/silk/hourglass_add.png trunk/src/main/webapp/codemirror-ui/images/silk/hourglass_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/hourglass_go.png trunk/src/main/webapp/codemirror-ui/images/silk/hourglass_link.png trunk/src/main/webapp/codemirror-ui/images/silk/house.png trunk/src/main/webapp/codemirror-ui/images/silk/house_go.png trunk/src/main/webapp/codemirror-ui/images/silk/house_link.png trunk/src/main/webapp/codemirror-ui/images/silk/html.png trunk/src/main/webapp/codemirror-ui/images/silk/html_add.png trunk/src/main/webapp/codemirror-ui/images/silk/html_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/html_go.png trunk/src/main/webapp/codemirror-ui/images/silk/html_valid.png trunk/src/main/webapp/codemirror-ui/images/silk/image.png trunk/src/main/webapp/codemirror-ui/images/silk/image_add.png trunk/src/main/webapp/codemirror-ui/images/silk/image_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/image_edit.png trunk/src/main/webapp/codemirror-ui/images/silk/image_link.png trunk/src/main/webapp/codemirror-ui/images/silk/images.png trunk/src/main/webapp/codemirror-ui/images/silk/information.png trunk/src/main/webapp/codemirror-ui/images/silk/ipod.png trunk/src/main/webapp/codemirror-ui/images/silk/ipod_cast.png trunk/src/main/webapp/codemirror-ui/images/silk/ipod_cast_add.png trunk/src/main/webapp/codemirror-ui/images/silk/ipod_cast_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/ipod_sound.png trunk/src/main/webapp/codemirror-ui/images/silk/joystick.png trunk/src/main/webapp/codemirror-ui/images/silk/joystick_add.png trunk/src/main/webapp/codemirror-ui/images/silk/joystick_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/joystick_error.png trunk/src/main/webapp/codemirror-ui/images/silk/key.png trunk/src/main/webapp/codemirror-ui/images/silk/key_add.png trunk/src/main/webapp/codemirror-ui/images/silk/key_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/key_go.png trunk/src/main/webapp/codemirror-ui/images/silk/keyboard.png trunk/src/main/webapp/codemirror-ui/images/silk/keyboard_add.png trunk/src/main/webapp/codemirror-ui/images/silk/keyboard_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/keyboard_magnify.png trunk/src/main/webapp/codemirror-ui/images/silk/layers.png trunk/src/main/webapp/codemirror-ui/images/silk/layout.png trunk/src/main/webapp/codemirror-ui/images/silk/layout_add.png trunk/src/main/webapp/codemirror-ui/images/silk/layout_content.png trunk/src/main/webapp/codemirror-ui/images/silk/layout_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/layout_edit.png trunk/src/main/webapp/codemirror-ui/images/silk/layout_error.png trunk/src/main/webapp/codemirror-ui/images/silk/layout_header.png trunk/src/main/webapp/codemirror-ui/images/silk/layout_link.png trunk/src/main/webapp/codemirror-ui/images/silk/layout_sidebar.png trunk/src/main/webapp/codemirror-ui/images/silk/lightbulb.png trunk/src/main/webapp/codemirror-ui/images/silk/lightbulb_add.png trunk/src/main/webapp/codemirror-ui/images/silk/lightbulb_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/lightbulb_off.png trunk/src/main/webapp/codemirror-ui/images/silk/lightning.png trunk/src/main/webapp/codemirror-ui/images/silk/lightning_add.png trunk/src/main/webapp/codemirror-ui/images/silk/lightning_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/lightning_go.png trunk/src/main/webapp/codemirror-ui/images/silk/link.png trunk/src/main/webapp/codemirror-ui/images/silk/link_add.png trunk/src/main/webapp/codemirror-ui/images/silk/link_break.png trunk/src/main/webapp/codemirror-ui/images/silk/link_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/link_edit.png trunk/src/main/webapp/codemirror-ui/images/silk/link_error.png trunk/src/main/webapp/codemirror-ui/images/silk/link_go.png trunk/src/main/webapp/codemirror-ui/images/silk/lock.png trunk/src/main/webapp/codemirror-ui/images/silk/lock_add.png trunk/src/main/webapp/codemirror-ui/images/silk/lock_break.png trunk/src/main/webapp/codemirror-ui/images/silk/lock_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/lock_edit.png trunk/src/main/webapp/codemirror-ui/images/silk/lock_go.png trunk/src/main/webapp/codemirror-ui/images/silk/lock_open.png trunk/src/main/webapp/codemirror-ui/images/silk/lorry.png trunk/src/main/webapp/codemirror-ui/images/silk/lorry_add.png trunk/src/main/webapp/codemirror-ui/images/silk/lorry_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/lorry_error.png trunk/src/main/webapp/codemirror-ui/images/silk/lorry_flatbed.png trunk/src/main/webapp/codemirror-ui/images/silk/lorry_go.png trunk/src/main/webapp/codemirror-ui/images/silk/lorry_link.png trunk/src/main/webapp/codemirror-ui/images/silk/magifier_zoom_out.png trunk/src/main/webapp/codemirror-ui/images/silk/magnifier.png trunk/src/main/webapp/codemirror-ui/images/silk/magnifier_zoom_in.png trunk/src/main/webapp/codemirror-ui/images/silk/male.png trunk/src/main/webapp/codemirror-ui/images/silk/map.png trunk/src/main/webapp/codemirror-ui/images/silk/map_add.png trunk/src/main/webapp/codemirror-ui/images/silk/map_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/map_edit.png trunk/src/main/webapp/codemirror-ui/images/silk/map_go.png trunk/src/main/webapp/codemirror-ui/images/silk/map_magnify.png trunk/src/main/webapp/codemirror-ui/images/silk/medal_bronze_1.png trunk/src/main/webapp/codemirror-ui/images/silk/medal_bronze_2.png trunk/src/main/webapp/codemirror-ui/images/silk/medal_bronze_3.png trunk/src/main/webapp/codemirror-ui/images/silk/medal_bronze_add.png trunk/src/main/webapp/codemirror-ui/images/silk/medal_bronze_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/medal_gold_1.png trunk/src/main/webapp/codemirror-ui/images/silk/medal_gold_2.png trunk/src/main/webapp/codemirror-ui/images/silk/medal_gold_3.png trunk/src/main/webapp/codemirror-ui/images/silk/medal_gold_add.png trunk/src/main/webapp/codemirror-ui/images/silk/medal_gold_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/medal_silver_1.png trunk/src/main/webapp/codemirror-ui/images/silk/medal_silver_2.png trunk/src/main/webapp/codemirror-ui/images/silk/medal_silver_3.png trunk/src/main/webapp/codemirror-ui/images/silk/medal_silver_add.png trunk/src/main/webapp/codemirror-ui/images/silk/medal_silver_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/money.png trunk/src/main/webapp/codemirror-ui/images/silk/money_add.png trunk/src/main/webapp/codemirror-ui/images/silk/money_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/money_dollar.png trunk/src/main/webapp/codemirror-ui/images/silk/money_euro.png trunk/src/main/webapp/codemirror-ui/images/silk/money_pound.png trunk/src/main/webapp/codemirror-ui/images/silk/money_yen.png trunk/src/main/webapp/codemirror-ui/images/silk/monitor.png trunk/src/main/webapp/codemirror-ui/images/silk/monitor_add.png trunk/src/main/webapp/codemirror-ui/images/silk/monitor_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/monitor_edit.png trunk/src/main/webapp/codemirror-ui/images/silk/monitor_error.png trunk/src/main/webapp/codemirror-ui/images/silk/monitor_go.png trunk/src/main/webapp/codemirror-ui/images/silk/monitor_lightning.png trunk/src/main/webapp/codemirror-ui/images/silk/monitor_link.png trunk/src/main/webapp/codemirror-ui/images/silk/mouse.png trunk/src/main/webapp/codemirror-ui/images/silk/mouse_add.png trunk/src/main/webapp/codemirror-ui/images/silk/mouse_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/mouse_error.png trunk/src/main/webapp/codemirror-ui/images/silk/music.png trunk/src/main/webapp/codemirror-ui/images/silk/new.png trunk/src/main/webapp/codemirror-ui/images/silk/newspaper.png trunk/src/main/webapp/codemirror-ui/images/silk/newspaper_add.png trunk/src/main/webapp/codemirror-ui/images/silk/newspaper_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/newspaper_go.png trunk/src/main/webapp/codemirror-ui/images/silk/newspaper_link.png trunk/src/main/webapp/codemirror-ui/images/silk/note.png trunk/src/main/webapp/codemirror-ui/images/silk/note_add.png trunk/src/main/webapp/codemirror-ui/images/silk/note_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/note_edit.png trunk/src/main/webapp/codemirror-ui/images/silk/note_error.png trunk/src/main/webapp/codemirror-ui/images/silk/note_go.png trunk/src/main/webapp/codemirror-ui/images/silk/overlays.png trunk/src/main/webapp/codemirror-ui/images/silk/package.png trunk/src/main/webapp/codemirror-ui/images/silk/package_add.png trunk/src/main/webapp/codemirror-ui/images/silk/package_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/package_go.png trunk/src/main/webapp/codemirror-ui/images/silk/package_green.png trunk/src/main/webapp/codemirror-ui/images/silk/package_link.png trunk/src/main/webapp/codemirror-ui/images/silk/page.png trunk/src/main/webapp/codemirror-ui/images/silk/page_add.png trunk/src/main/webapp/codemirror-ui/images/silk/page_attach.png trunk/src/main/webapp/codemirror-ui/images/silk/page_code.png trunk/src/main/webapp/codemirror-ui/images/silk/page_copy.png trunk/src/main/webapp/codemirror-ui/images/silk/page_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/page_edit.png trunk/src/main/webapp/codemirror-ui/images/silk/page_error.png trunk/src/main/webapp/codemirror-ui/images/silk/page_excel.png trunk/src/main/webapp/codemirror-ui/images/silk/page_find.png trunk/src/main/webapp/codemirror-ui/images/silk/page_gear.png trunk/src/main/webapp/codemirror-ui/images/silk/page_go.png trunk/src/main/webapp/codemirror-ui/images/silk/page_green.png trunk/src/main/webapp/codemirror-ui/images/silk/page_key.png trunk/src/main/webapp/codemirror-ui/images/silk/page_lightning.png trunk/src/main/webapp/codemirror-ui/images/silk/page_link.png trunk/src/main/webapp/codemirror-ui/images/silk/page_paintbrush.png trunk/src/main/webapp/codemirror-ui/images/silk/page_paste.png trunk/src/main/webapp/codemirror-ui/images/silk/page_red.png trunk/src/main/webapp/codemirror-ui/images/silk/page_refresh.png trunk/src/main/webapp/codemirror-ui/images/silk/page_save.png trunk/src/main/webapp/codemirror-ui/images/silk/page_white.png trunk/src/main/webapp/codemirror-ui/images/silk/page_white_acrobat.png trunk/src/main/webapp/codemirror-ui/images/silk/page_white_actionscript.png trunk/src/main/webapp/codemirror-ui/images/silk/page_white_add.png trunk/src/main/webapp/codemirror-ui/images/silk/page_white_c.png trunk/src/main/webapp/codemirror-ui/images/silk/page_white_camera.png trunk/src/main/webapp/codemirror-ui/images/silk/page_white_cd.png trunk/src/main/webapp/codemirror-ui/images/silk/page_white_code.png trunk/src/main/webapp/codemirror-ui/images/silk/page_white_code_red.png trunk/src/main/webapp/codemirror-ui/images/silk/page_white_coldfusion.png trunk/src/main/webapp/codemirror-ui/images/silk/page_white_compressed.png trunk/src/main/webapp/codemirror-ui/images/silk/page_white_copy.png trunk/src/main/webapp/codemirror-ui/images/silk/page_white_cplusplus.png trunk/src/main/webapp/codemirror-ui/images/silk/page_white_csharp.png trunk/src/main/webapp/codemirror-ui/images/silk/page_white_cup.png trunk/src/main/webapp/codemirror-ui/images/silk/page_white_database.png trunk/src/main/webapp/codemirror-ui/images/silk/page_white_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/page_white_dvd.png trunk/src/main/webapp/codemirror-ui/images/silk/page_white_edit.png trunk/src/main/webapp/codemirror-ui/images/silk/page_white_error.png trunk/src/main/webapp/codemirror-ui/images/silk/page_white_excel.png trunk/src/main/webapp/codemirror-ui/images/silk/page_white_find.png trunk/src/main/webapp/codemirror-ui/images/silk/page_white_flash.png trunk/src/main/webapp/codemirror-ui/images/silk/page_white_freehand.png trunk/src/main/webapp/codemirror-ui/images/silk/page_white_gear.png trunk/src/main/webapp/codemirror-ui/images/silk/page_white_get.png trunk/src/main/webapp/codemirror-ui/images/silk/page_white_go.png trunk/src/main/webapp/codemirror-ui/images/silk/page_white_h.png trunk/src/main/webapp/codemirror-ui/images/silk/page_white_horizontal.png trunk/src/main/webapp/codemirror-ui/images/silk/page_white_key.png trunk/src/main/webapp/codemirror-ui/images/silk/page_white_lightning.png trunk/src/main/webapp/codemirror-ui/images/silk/page_white_link.png trunk/src/main/webapp/codemirror-ui/images/silk/page_white_magnify.png trunk/src/main/webapp/codemirror-ui/images/silk/page_white_medal.png trunk/src/main/webapp/codemirror-ui/images/silk/page_white_office.png trunk/src/main/webapp/codemirror-ui/images/silk/page_white_paint.png trunk/src/main/webapp/codemirror-ui/images/silk/page_white_paintbrush.png trunk/src/main/webapp/codemirror-ui/images/silk/page_white_paste.png trunk/src/main/webapp/codemirror-ui/images/silk/page_white_php.png trunk/src/main/webapp/codemirror-ui/images/silk/page_white_picture.png trunk/src/main/webapp/codemirror-ui/images/silk/page_white_powerpoint.png trunk/src/main/webapp/codemirror-ui/images/silk/page_white_put.png trunk/src/main/webapp/codemirror-ui/images/silk/page_white_ruby.png trunk/src/main/webapp/codemirror-ui/images/silk/page_white_stack.png trunk/src/main/webapp/codemirror-ui/images/silk/page_white_star.png trunk/src/main/webapp/codemirror-ui/images/silk/page_white_swoosh.png trunk/src/main/webapp/codemirror-ui/images/silk/page_white_text.png trunk/src/main/webapp/codemirror-ui/images/silk/page_white_text_width.png trunk/src/main/webapp/codemirror-ui/images/silk/page_white_tux.png trunk/src/main/webapp/codemirror-ui/images/silk/page_white_vector.png trunk/src/main/webapp/codemirror-ui/images/silk/page_white_visualstudio.png trunk/src/main/webapp/codemirror-ui/images/silk/page_white_width.png trunk/src/main/webapp/codemirror-ui/images/silk/page_white_word.png trunk/src/main/webapp/codemirror-ui/images/silk/page_white_world.png trunk/src/main/webapp/codemirror-ui/images/silk/page_white_wrench.png trunk/src/main/webapp/codemirror-ui/images/silk/page_white_zip.png trunk/src/main/webapp/codemirror-ui/images/silk/page_word.png trunk/src/main/webapp/codemirror-ui/images/silk/page_world.png trunk/src/main/webapp/codemirror-ui/images/silk/paintbrush.png trunk/src/main/webapp/codemirror-ui/images/silk/paintcan.png trunk/src/main/webapp/codemirror-ui/images/silk/palette.png trunk/src/main/webapp/codemirror-ui/images/silk/paste_plain.png trunk/src/main/webapp/codemirror-ui/images/silk/paste_word.png trunk/src/main/webapp/codemirror-ui/images/silk/pencil.png trunk/src/main/webapp/codemirror-ui/images/silk/pencil_add.png trunk/src/main/webapp/codemirror-ui/images/silk/pencil_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/pencil_go.png trunk/src/main/webapp/codemirror-ui/images/silk/phone.png trunk/src/main/webapp/codemirror-ui/images/silk/phone_add.png trunk/src/main/webapp/codemirror-ui/images/silk/phone_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/phone_sound.png trunk/src/main/webapp/codemirror-ui/images/silk/photo.png trunk/src/main/webapp/codemirror-ui/images/silk/photo_add.png trunk/src/main/webapp/codemirror-ui/images/silk/photo_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/photo_link.png trunk/src/main/webapp/codemirror-ui/images/silk/photos.png trunk/src/main/webapp/codemirror-ui/images/silk/picture.png trunk/src/main/webapp/codemirror-ui/images/silk/picture_add.png trunk/src/main/webapp/codemirror-ui/images/silk/picture_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/picture_edit.png trunk/src/main/webapp/codemirror-ui/images/silk/picture_empty.png trunk/src/main/webapp/codemirror-ui/images/silk/picture_error.png trunk/src/main/webapp/codemirror-ui/images/silk/picture_go.png trunk/src/main/webapp/codemirror-ui/images/silk/picture_key.png trunk/src/main/webapp/codemirror-ui/images/silk/picture_link.png trunk/src/main/webapp/codemirror-ui/images/silk/picture_save.png trunk/src/main/webapp/codemirror-ui/images/silk/pictures.png trunk/src/main/webapp/codemirror-ui/images/silk/pilcrow.png trunk/src/main/webapp/codemirror-ui/images/silk/pill.png trunk/src/main/webapp/codemirror-ui/images/silk/pill_add.png trunk/src/main/webapp/codemirror-ui/images/silk/pill_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/pill_go.png trunk/src/main/webapp/codemirror-ui/images/silk/plugin.png trunk/src/main/webapp/codemirror-ui/images/silk/plugin_add.png trunk/src/main/webapp/codemirror-ui/images/silk/plugin_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/plugin_disabled.png trunk/src/main/webapp/codemirror-ui/images/silk/plugin_edit.png trunk/src/main/webapp/codemirror-ui/images/silk/plugin_error.png trunk/src/main/webapp/codemirror-ui/images/silk/plugin_go.png trunk/src/main/webapp/codemirror-ui/images/silk/plugin_link.png trunk/src/main/webapp/codemirror-ui/images/silk/printer.png trunk/src/main/webapp/codemirror-ui/images/silk/printer_add.png trunk/src/main/webapp/codemirror-ui/images/silk/printer_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/printer_empty.png trunk/src/main/webapp/codemirror-ui/images/silk/printer_error.png trunk/src/main/webapp/codemirror-ui/images/silk/rainbow.png trunk/src/main/webapp/codemirror-ui/images/silk/report.png trunk/src/main/webapp/codemirror-ui/images/silk/report_add.png trunk/src/main/webapp/codemirror-ui/images/silk/report_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/report_disk.png trunk/src/main/webapp/codemirror-ui/images/silk/report_edit.png trunk/src/main/webapp/codemirror-ui/images/silk/report_go.png trunk/src/main/webapp/codemirror-ui/images/silk/report_key.png trunk/src/main/webapp/codemirror-ui/images/silk/report_link.png trunk/src/main/webapp/codemirror-ui/images/silk/report_magnify.png trunk/src/main/webapp/codemirror-ui/images/silk/report_picture.png trunk/src/main/webapp/codemirror-ui/images/silk/report_user.png trunk/src/main/webapp/codemirror-ui/images/silk/report_word.png trunk/src/main/webapp/codemirror-ui/images/silk/resultset_first.png trunk/src/main/webapp/codemirror-ui/images/silk/resultset_last.png trunk/src/main/webapp/codemirror-ui/images/silk/resultset_next.png trunk/src/main/webapp/codemirror-ui/images/silk/resultset_previous.png trunk/src/main/webapp/codemirror-ui/images/silk/rosette.png trunk/src/main/webapp/codemirror-ui/images/silk/rss.png trunk/src/main/webapp/codemirror-ui/images/silk/rss_add.png trunk/src/main/webapp/codemirror-ui/images/silk/rss_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/rss_go.png trunk/src/main/webapp/codemirror-ui/images/silk/rss_valid.png trunk/src/main/webapp/codemirror-ui/images/silk/ruby.png trunk/src/main/webapp/codemirror-ui/images/silk/ruby_add.png trunk/src/main/webapp/codemirror-ui/images/silk/ruby_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/ruby_gear.png trunk/src/main/webapp/codemirror-ui/images/silk/ruby_get.png trunk/src/main/webapp/codemirror-ui/images/silk/ruby_go.png trunk/src/main/webapp/codemirror-ui/images/silk/ruby_key.png trunk/src/main/webapp/codemirror-ui/images/silk/ruby_link.png trunk/src/main/webapp/codemirror-ui/images/silk/ruby_put.png trunk/src/main/webapp/codemirror-ui/images/silk/script.png trunk/src/main/webapp/codemirror-ui/images/silk/script_add.png trunk/src/main/webapp/codemirror-ui/images/silk/script_code.png trunk/src/main/webapp/codemirror-ui/images/silk/script_code_red.png trunk/src/main/webapp/codemirror-ui/images/silk/script_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/script_edit.png trunk/src/main/webapp/codemirror-ui/images/silk/script_error.png trunk/src/main/webapp/codemirror-ui/images/silk/script_gear.png trunk/src/main/webapp/codemirror-ui/images/silk/script_go.png trunk/src/main/webapp/codemirror-ui/images/silk/script_key.png trunk/src/main/webapp/codemirror-ui/images/silk/script_lightning.png trunk/src/main/webapp/codemirror-ui/images/silk/script_link.png trunk/src/main/webapp/codemirror-ui/images/silk/script_palette.png trunk/src/main/webapp/codemirror-ui/images/silk/script_save.png trunk/src/main/webapp/codemirror-ui/images/silk/server.png trunk/src/main/webapp/codemirror-ui/images/silk/server_add.png trunk/src/main/webapp/codemirror-ui/images/silk/server_chart.png trunk/src/main/webapp/codemirror-ui/images/silk/server_compressed.png trunk/src/main/webapp/codemirror-ui/images/silk/server_connect.png trunk/src/main/webapp/codemirror-ui/images/silk/server_database.png trunk/src/main/webapp/codemirror-ui/images/silk/server_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/server_edit.png trunk/src/main/webapp/codemirror-ui/images/silk/server_error.png trunk/src/main/webapp/codemirror-ui/images/silk/server_go.png trunk/src/main/webapp/codemirror-ui/images/silk/server_key.png trunk/src/main/webapp/codemirror-ui/images/silk/server_lightning.png trunk/src/main/webapp/codemirror-ui/images/silk/server_link.png trunk/src/main/webapp/codemirror-ui/images/silk/server_uncompressed.png trunk/src/main/webapp/codemirror-ui/images/silk/shading.png trunk/src/main/webapp/codemirror-ui/images/silk/shape_align_bottom.png trunk/src/main/webapp/codemirror-ui/images/silk/shape_align_center.png trunk/src/main/webapp/codemirror-ui/images/silk/shape_align_left.png trunk/src/main/webapp/codemirror-ui/images/silk/shape_align_middle.png trunk/src/main/webapp/codemirror-ui/images/silk/shape_align_right.png trunk/src/main/webapp/codemirror-ui/images/silk/shape_align_top.png trunk/src/main/webapp/codemirror-ui/images/silk/shape_flip_horizontal.png trunk/src/main/webapp/codemirror-ui/images/silk/shape_flip_vertical.png trunk/src/main/webapp/codemirror-ui/images/silk/shape_group.png trunk/src/main/webapp/codemirror-ui/images/silk/shape_handles.png trunk/src/main/webapp/codemirror-ui/images/silk/shape_move_back.png trunk/src/main/webapp/codemirror-ui/images/silk/shape_move_backwards.png trunk/src/main/webapp/codemirror-ui/images/silk/shape_move_forwards.png trunk/src/main/webapp/codemirror-ui/images/silk/shape_move_front.png trunk/src/main/webapp/codemirror-ui/images/silk/shape_rotate_anticlockwise.png trunk/src/main/webapp/codemirror-ui/images/silk/shape_rotate_clockwise.png trunk/src/main/webapp/codemirror-ui/images/silk/shape_square.png trunk/src/main/webapp/codemirror-ui/images/silk/shape_square_add.png trunk/src/main/webapp/codemirror-ui/images/silk/shape_square_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/shape_square_edit.png trunk/src/main/webapp/codemirror-ui/images/silk/shape_square_error.png trunk/src/main/webapp/codemirror-ui/images/silk/shape_square_go.png trunk/src/main/webapp/codemirror-ui/images/silk/shape_square_key.png trunk/src/main/webapp/codemirror-ui/images/silk/shape_square_link.png trunk/src/main/webapp/codemirror-ui/images/silk/shape_ungroup.png trunk/src/main/webapp/codemirror-ui/images/silk/shield.png trunk/src/main/webapp/codemirror-ui/images/silk/shield_add.png trunk/src/main/webapp/codemirror-ui/images/silk/shield_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/shield_go.png trunk/src/main/webapp/codemirror-ui/images/silk/sitemap.png trunk/src/main/webapp/codemirror-ui/images/silk/sitemap_color.png trunk/src/main/webapp/codemirror-ui/images/silk/sound.png trunk/src/main/webapp/codemirror-ui/images/silk/sound_add.png trunk/src/main/webapp/codemirror-ui/images/silk/sound_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/sound_low.png trunk/src/main/webapp/codemirror-ui/images/silk/sound_mute.png trunk/src/main/webapp/codemirror-ui/images/silk/sound_none.png trunk/src/main/webapp/codemirror-ui/images/silk/spellcheck.png trunk/src/main/webapp/codemirror-ui/images/silk/sport_8ball.png trunk/src/main/webapp/codemirror-ui/images/silk/sport_basketball.png trunk/src/main/webapp/codemirror-ui/images/silk/sport_football.png trunk/src/main/webapp/codemirror-ui/images/silk/sport_golf.png trunk/src/main/webapp/codemirror-ui/images/silk/sport_raquet.png trunk/src/main/webapp/codemirror-ui/images/silk/sport_shuttlecock.png trunk/src/main/webapp/codemirror-ui/images/silk/sport_soccer.png trunk/src/main/webapp/codemirror-ui/images/silk/sport_tennis.png trunk/src/main/webapp/codemirror-ui/images/silk/star.png trunk/src/main/webapp/codemirror-ui/images/silk/status_away.png trunk/src/main/webapp/codemirror-ui/images/silk/status_busy.png trunk/src/main/webapp/codemirror-ui/images/silk/status_offline.png trunk/src/main/webapp/codemirror-ui/images/silk/status_online.png trunk/src/main/webapp/codemirror-ui/images/silk/stop.png trunk/src/main/webapp/codemirror-ui/images/silk/style.png trunk/src/main/webapp/codemirror-ui/images/silk/style_add.png trunk/src/main/webapp/codemirror-ui/images/silk/style_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/style_edit.png trunk/src/main/webapp/codemirror-ui/images/silk/style_go.png trunk/src/main/webapp/codemirror-ui/images/silk/sum.png trunk/src/main/webapp/codemirror-ui/images/silk/tab.png trunk/src/main/webapp/codemirror-ui/images/silk/tab_add.png trunk/src/main/webapp/codemirror-ui/images/silk/tab_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/tab_edit.png trunk/src/main/webapp/codemirror-ui/images/silk/tab_go.png trunk/src/main/webapp/codemirror-ui/images/silk/table.png trunk/src/main/webapp/codemirror-ui/images/silk/table_add.png trunk/src/main/webapp/codemirror-ui/images/silk/table_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/table_edit.png trunk/src/main/webapp/codemirror-ui/images/silk/table_error.png trunk/src/main/webapp/codemirror-ui/images/silk/table_gear.png trunk/src/main/webapp/codemirror-ui/images/silk/table_go.png trunk/src/main/webapp/codemirror-ui/images/silk/table_key.png trunk/src/main/webapp/codemirror-ui/images/silk/table_lightning.png trunk/src/main/webapp/codemirror-ui/images/silk/table_link.png trunk/src/main/webapp/codemirror-ui/images/silk/table_multiple.png trunk/src/main/webapp/codemirror-ui/images/silk/table_refresh.png trunk/src/main/webapp/codemirror-ui/images/silk/table_relationship.png trunk/src/main/webapp/codemirror-ui/images/silk/table_row_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/table_row_insert.png trunk/src/main/webapp/codemirror-ui/images/silk/table_save.png trunk/src/main/webapp/codemirror-ui/images/silk/table_sort.png trunk/src/main/webapp/codemirror-ui/images/silk/tag.png trunk/src/main/webapp/codemirror-ui/images/silk/tag_blue.png trunk/src/main/webapp/codemirror-ui/images/silk/tag_blue_add.png trunk/src/main/webapp/codemirror-ui/images/silk/tag_blue_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/tag_blue_edit.png trunk/src/main/webapp/codemirror-ui/images/silk/tag_green.png trunk/src/main/webapp/codemirror-ui/images/silk/tag_orange.png trunk/src/main/webapp/codemirror-ui/images/silk/tag_pink.png trunk/src/main/webapp/codemirror-ui/images/silk/tag_purple.png trunk/src/main/webapp/codemirror-ui/images/silk/tag_red.png trunk/src/main/webapp/codemirror-ui/images/silk/tag_yellow.png trunk/src/main/webapp/codemirror-ui/images/silk/telephone.png trunk/src/main/webapp/codemirror-ui/images/silk/telephone_add.png trunk/src/main/webapp/codemirror-ui/images/silk/telephone_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/telephone_edit.png trunk/src/main/webapp/codemirror-ui/images/silk/telephone_error.png trunk/src/main/webapp/codemirror-ui/images/silk/telephone_go.png trunk/src/main/webapp/codemirror-ui/images/silk/telephone_key.png trunk/src/main/webapp/codemirror-ui/images/silk/telephone_link.png trunk/src/main/webapp/codemirror-ui/images/silk/television.png trunk/src/main/webapp/codemirror-ui/images/silk/television_add.png trunk/src/main/webapp/codemirror-ui/images/silk/television_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/text_align_center.png trunk/src/main/webapp/codemirror-ui/images/silk/text_align_justify.png trunk/src/main/webapp/codemirror-ui/images/silk/text_align_left.png trunk/src/main/webapp/codemirror-ui/images/silk/text_align_right.png trunk/src/main/webapp/codemirror-ui/images/silk/text_allcaps.png trunk/src/main/webapp/codemirror-ui/images/silk/text_bold.png trunk/src/main/webapp/codemirror-ui/images/silk/text_columns.png trunk/src/main/webapp/codemirror-ui/images/silk/text_dropcaps.png trunk/src/main/webapp/codemirror-ui/images/silk/text_heading_1.png trunk/src/main/webapp/codemirror-ui/images/silk/text_heading_2.png trunk/src/main/webapp/codemirror-ui/images/silk/text_heading_3.png trunk/src/main/webapp/codemirror-ui/images/silk/text_heading_4.png trunk/src/main/webapp/codemirror-ui/images/silk/text_heading_5.png trunk/src/main/webapp/codemirror-ui/images/silk/text_heading_6.png trunk/src/main/webapp/codemirror-ui/images/silk/text_horizontalrule.png trunk/src/main/webapp/codemirror-ui/images/silk/text_indent.png trunk/src/main/webapp/codemirror-ui/images/silk/text_indent_remove.png trunk/src/main/webapp/codemirror-ui/images/silk/text_italic.png trunk/src/main/webapp/codemirror-ui/images/silk/text_kerning.png trunk/src/main/webapp/codemirror-ui/images/silk/text_letter_omega.png trunk/src/main/webapp/codemirror-ui/images/silk/text_letterspacing.png trunk/src/main/webapp/codemirror-ui/images/silk/text_linespacing.png trunk/src/main/webapp/codemirror-ui/images/silk/text_list_bullets.png trunk/src/main/webapp/codemirror-ui/images/silk/text_list_numbers.png trunk/src/main/webapp/codemirror-ui/images/silk/text_lowercase.png trunk/src/main/webapp/codemirror-ui/images/silk/text_padding_bottom.png trunk/src/main/webapp/codemirror-ui/images/silk/text_padding_left.png trunk/src/main/webapp/codemirror-ui/images/silk/text_padding_right.png trunk/src/main/webapp/codemirror-ui/images/silk/text_padding_top.png trunk/src/main/webapp/codemirror-ui/images/silk/text_replace.png trunk/src/main/webapp/codemirror-ui/images/silk/text_signature.png trunk/src/main/webapp/codemirror-ui/images/silk/text_smallcaps.png trunk/src/main/webapp/codemirror-ui/images/silk/text_strikethrough.png trunk/src/main/webapp/codemirror-ui/images/silk/text_subscript.png trunk/src/main/webapp/codemirror-ui/images/silk/text_superscript.png trunk/src/main/webapp/codemirror-ui/images/silk/text_underline.png trunk/src/main/webapp/codemirror-ui/images/silk/text_uppercase.png trunk/src/main/webapp/codemirror-ui/images/silk/textfield.png trunk/src/main/webapp/codemirror-ui/images/silk/textfield_add.png trunk/src/main/webapp/codemirror-ui/images/silk/textfield_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/textfield_key.png trunk/src/main/webapp/codemirror-ui/images/silk/textfield_rename.png trunk/src/main/webapp/codemirror-ui/images/silk/thumb_down.png trunk/src/main/webapp/codemirror-ui/images/silk/thumb_up.png trunk/src/main/webapp/codemirror-ui/images/silk/tick.png trunk/src/main/webapp/codemirror-ui/images/silk/time.png trunk/src/main/webapp/codemirror-ui/images/silk/time_add.png trunk/src/main/webapp/codemirror-ui/images/silk/time_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/time_go.png trunk/src/main/webapp/codemirror-ui/images/silk/timeline_marker.png trunk/src/main/webapp/codemirror-ui/images/silk/transmit.png trunk/src/main/webapp/codemirror-ui/images/silk/transmit_add.png trunk/src/main/webapp/codemirror-ui/images/silk/transmit_blue.png trunk/src/main/webapp/codemirror-ui/images/silk/transmit_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/transmit_edit.png trunk/src/main/webapp/codemirror-ui/images/silk/transmit_error.png trunk/src/main/webapp/codemirror-ui/images/silk/transmit_go.png trunk/src/main/webapp/codemirror-ui/images/silk/tux.png trunk/src/main/webapp/codemirror-ui/images/silk/user.png trunk/src/main/webapp/codemirror-ui/images/silk/user_add.png trunk/src/main/webapp/codemirror-ui/images/silk/user_comment.png trunk/src/main/webapp/codemirror-ui/images/silk/user_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/user_edit.png trunk/src/main/webapp/codemirror-ui/images/silk/user_female.png trunk/src/main/webapp/codemirror-ui/images/silk/user_go.png trunk/src/main/webapp/codemirror-ui/images/silk/user_gray.png trunk/src/main/webapp/codemirror-ui/images/silk/user_green.png trunk/src/main/webapp/codemirror-ui/images/silk/user_orange.png trunk/src/main/webapp/codemirror-ui/images/silk/user_red.png trunk/src/main/webapp/codemirror-ui/images/silk/user_suit.png trunk/src/main/webapp/codemirror-ui/images/silk/vcard.png trunk/src/main/webapp/codemirror-ui/images/silk/vcard_add.png trunk/src/main/webapp/codemirror-ui/images/silk/vcard_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/vcard_edit.png trunk/src/main/webapp/codemirror-ui/images/silk/vector.png trunk/src/main/webapp/codemirror-ui/images/silk/vector_add.png trunk/src/main/webapp/codemirror-ui/images/silk/vector_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/wand.png trunk/src/main/webapp/codemirror-ui/images/silk/weather_clouds.png trunk/src/main/webapp/codemirror-ui/images/silk/weather_cloudy.png trunk/src/main/webapp/codemirror-ui/images/silk/weather_lightning.png trunk/src/main/webapp/codemirror-ui/images/silk/weather_rain.png trunk/src/main/webapp/codemirror-ui/images/silk/weather_snow.png trunk/src/main/webapp/codemirror-ui/images/silk/weather_sun.png trunk/src/main/webapp/codemirror-ui/images/silk/webcam.png trunk/src/main/webapp/codemirror-ui/images/silk/webcam_add.png trunk/src/main/webapp/codemirror-ui/images/silk/webcam_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/webcam_error.png trunk/src/main/webapp/codemirror-ui/images/silk/world.png trunk/src/main/webapp/codemirror-ui/images/silk/world_add.png trunk/src/main/webapp/codemirror-ui/images/silk/world_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/world_edit.png trunk/src/main/webapp/codemirror-ui/images/silk/world_go.png trunk/src/main/webapp/codemirror-ui/images/silk/world_link.png trunk/src/main/webapp/codemirror-ui/images/silk/wrench.png trunk/src/main/webapp/codemirror-ui/images/silk/wrench_orange.png trunk/src/main/webapp/codemirror-ui/images/silk/xhtml.png trunk/src/main/webapp/codemirror-ui/images/silk/xhtml_add.png trunk/src/main/webapp/codemirror-ui/images/silk/xhtml_delete.png trunk/src/main/webapp/codemirror-ui/images/silk/xhtml_go.png trunk/src/main/webapp/codemirror-ui/images/silk/xhtml_valid.png trunk/src/main/webapp/codemirror-ui/images/silk/zoom.png trunk/src/main/webapp/codemirror-ui/images/silk/zoom_in.png trunk/src/main/webapp/codemirror-ui/images/silk/zoom_out.png trunk/src/main/webapp/codemirror-ui/index.html trunk/src/main/webapp/codemirror-ui/js/ trunk/src/main/webapp/codemirror-ui/js/codemirror-ui-find.js trunk/src/main/webapp/codemirror-ui/js/codemirror-ui.js trunk/src/main/webapp/codemirror-ui/js/find_replace.html trunk/src/main/webapp/codemirror-ui/lib/ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/LICENSE trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/README.md trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/compress.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/css/ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/css/baboon.png trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/css/baboon_vector.svg trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/css/docs.css trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/css/font.js trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/demo/ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/demo/activeline.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/demo/complete.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/demo/complete.js trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/demo/marker.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/demo/mustache.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/demo/resize.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/demo/search.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/index.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/internals.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/lib/ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/lib/codemirror.css trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/lib/codemirror.js trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/lib/overlay.js trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/manual.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/clike/ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/clike/clike.css trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/clike/clike.js trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/clike/index.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/css/ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/css/css.css trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/css/css.js trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/css/index.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/diff/ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/diff/diff.css trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/diff/diff.js trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/diff/index.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/haskell/ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/haskell/haskell.css trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/haskell/haskell.js trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/haskell/index.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/htmlmixed/ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/htmlmixed/htmlmixed.js trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/htmlmixed/index.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/javascript/ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/javascript/index.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/javascript/javascript.css trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/javascript/javascript.js trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/php/ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/php/index.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/php/php.js trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/stex/ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/stex/index.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/stex/stex.css trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/stex/stex.js trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/xml/ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/xml/index.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/xml/xml.css trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/xml/xml.js trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/oldrelease.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/test/ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/test/index.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/test/test.js trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/LICENSE trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/README.md trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/compress.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/css/ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/css/baboon.png trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/css/baboon_vector.svg trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/css/docs.css trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/demo/ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/demo/activeline.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/demo/complete.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/demo/complete.js trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/demo/marker.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/demo/mustache.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/demo/resize.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/demo/runmode.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/demo/search.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/demo/theme.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/index.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/internals.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/lib/ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/lib/codemirror.css trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/lib/codemirror.js trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/lib/overlay.js trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/lib/runmode.js trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/manual.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/clike/ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/clike/clike.css trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/clike/clike.js trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/clike/index.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/css/ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/css/css.js trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/css/index.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/diff/ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/diff/diff.css trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/diff/diff.js trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/diff/index.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/haskell/ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/haskell/haskell.js trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/haskell/index.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/htmlmixed/ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/htmlmixed/htmlmixed.js trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/htmlmixed/index.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/javascript/ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/javascript/index.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/javascript/javascript.js trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/lua/ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/lua/index.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/lua/lua.js trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/php/ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/php/index.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/php/php.js trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/plsql/ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/plsql/index.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/plsql/plsql.js trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/python/ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/python/LICENSE.txt trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/python/index.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/python/python.js trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/rst/ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/rst/index.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/rst/rst.css trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/rst/rst.js trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/smalltalk/ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/smalltalk/index.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/smalltalk/smalltalk.js trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/stex/ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/stex/index.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/stex/stex.js trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/xml/ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/xml/index.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/xml/xml.js trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/oldrelease.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/test/ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/test/index.html trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/test/test.js trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/theme/ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/theme/default.css trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/theme/elegant.css trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/theme/neat.css trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/theme/night.css Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/SaveAction.java trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java trunk/src/main/webapp/ModificationViewer.jsp trunk/src/main/webapp/OutConnection.jsp trunk/src/main/webapp/css/main.css Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/SaveAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/SaveAction.java 2011-06-24 14:18:08 UTC (rev 137) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/SaveAction.java 2011-06-28 12:55:36 UTC (rev 138) @@ -1,11 +1,16 @@ package org.nuiton.scmwebeditor.actions; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + import com.opensymphony.xwork2.Action; import com.opensymphony.xwork2.ActionContext; public class SaveAction extends ScmWebEditorCommitAction { String result; + private static final Log log = LogFactory.getLog(SaveAction.class); + public String getResult() { return result; @@ -25,6 +30,12 @@ public String save() { + if(log.isDebugEnabled()) { + log.debug("originText : "+origText); + log.debug("newText : "+newText); + } + + if(origText.equals(newText)) { result = "uselessSave"; return Action.SUCCESS; Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java 2011-06-24 14:18:08 UTC (rev 137) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java 2011-06-28 12:55:36 UTC (rev 138) @@ -100,7 +100,7 @@ public String execute() { - System.setProperty("file.encoding", "UTF-8"); + HttpSession httpSession = request.getSession(true); SvnSession svnSess = getSvnSession(httpSession); Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java 2011-06-24 14:18:08 UTC (rev 137) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java 2011-06-28 12:55:36 UTC (rev 138) @@ -123,8 +123,8 @@ projectUrl=request.getHeader("referer"); HttpSession httpSession = request.getSession(true); - System.setProperty("file.encoding", "UTF-8"); + //SvnSession object creation if doesn't already exist SvnSession svnSess = getSvnSession(httpSession); @@ -205,10 +205,15 @@ // Si le fichier n'est pas de type texte, on ne peut pas l'éditer - if(!mineType.contains("text")) { + if( !mineType.matches(".*text.*|.*xml.*|.*javascript.*") ) { request.setAttribute("projectUrl", projectUrl); + //On supprime le repertoire temporaire + delTempDirectory(svnSess); return "erreurPath"; } + else { + request.setAttribute("minetype", mineType); + } try { Modified: trunk/src/main/webapp/ModificationViewer.jsp =================================================================== --- trunk/src/main/webapp/ModificationViewer.jsp 2011-06-24 14:18:08 UTC (rev 137) +++ trunk/src/main/webapp/ModificationViewer.jsp 2011-06-28 12:55:36 UTC (rev 138) @@ -1,4 +1,5 @@ <%-- Document : ModificationViewer Created on : 10 sept. 2009, 13:43:11 Author : glorieux --%> + <%@page import="org.apache.commons.lang.StringEscapeUtils"%> <%@page contentType="text/html" pageEncoding="UTF-8"%> <%@ taglib prefix="s" uri="/struts-tags"%> <%@ taglib prefix="sj" uri="/struts-jquery-tags"%> @@ -12,26 +13,172 @@ <link rel="icon" href="img/ScmWebEditor_little.png" type="image/png"> <link rel="stylesheet" type="text/css" href="css/main.css"> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> + +  +  + <script src="codemirror-ui/lib/CodeMirror-2.1/lib/codemirror.js" type="text/javascript"></script> + <link rel="stylesheet" href="codemirror-ui/lib/CodeMirror-2.1/lib/codemirror.css"> + + <script src="codemirror-ui/lib/CodeMirror-2.1/mode/rst/rst.js"></script> + <link rel="stylesheet" href="codemirror-ui/lib/CodeMirror-2.1/mode/rst/rst.css"> + + <link rel="stylesheet" href="codemirror-ui/lib/CodeMirror-2.1/theme/default.css"> + + <script src="codemirror-ui/lib/CodeMirror-2.1/mode/htmlmixed/htmlmixed.js"></script> + <script src="codemirror-ui/lib/CodeMirror-2.1/mode/javascript/javascript.js"></script> + <script src="codemirror-ui/lib/CodeMirror-2.1/mode/css/css.js"></script> + <script src="codemirror-ui/lib/CodeMirror-2.1/mode/xml/xml.js"></script> + + +  + <script src="codemirror-ui/js/codemirror-ui.js" type="text/javascript"></script> + <link rel="stylesheet" href="codemirror-ui/css/codemirror-ui.css" type="text/css" media="screen" /> + + </head> -<body onload="cleanForm();geresession(<%=request.getAttribute("InvalidateMaxTime")%>, 5);"> +<body onload="geresession(<%=request.getAttribute("InvalidateMaxTime")%>, 5);"> <a title="ScmWebEditor Project Website" target="_blank" href="http://maven-site.nuiton.org/scmwebeditor/"><img src="img/ScmWebEditor_main.png" alt="ScmWebEditor logo"/></a> - <center><h2>Welcome on SCMWebEditor</h2> - <%if (request.getAttribute("format")!=null && request.getAttribute("format").equals("rst") == true){ - %><h4>For any Problem with RestruturedText visit <a href="http://docutils.sourceforge.net/rst.html">RST documentation website</a>.</h4></center><%}%> + <center> + <h2>Welcome on SCMWebEditor</h2> + <% + String typeEditor="null"; + if (request.getAttribute("format")!=null && request.getAttribute("format").equals("rst")){ + typeEditor="rst"; + %><h4>For any Problem with RestruturedText visit <a href="http://docutils.sourceforge.net/rst.html">RST documentation website</a>.</h4> + <% } else if(request.getAttribute("format")!=null && request.getAttribute("format").equals("html")) { + typeEditor="text/html"; + } + %> + </center> + + <form method="post" action=commit.action id="editForm"> - <script src="GereFormSize.js" type="text/javascript"></script> - <% if(request.getAttribute("lastText")!=null) { %> - <textarea name="newText" id="newText"><%=request.getAttribute("lastText")%></textarea> - <% } else { %> - <textarea name="newText" id="newText"><%=request.getAttribute("OrigText")%></textarea> - <% } %> + + + + <% + String valueTextarea; + if(request.getAttribute("lastText")!=null) { + valueTextarea = (String) request.getAttribute("lastText"); + } else { + valueTextarea = (String) request.getAttribute("OrigText"); + } + + + %> + + <p>File in editor : <a href="<%=request.getAttribute("address")%>" ><%=request.getAttribute("address")%></a> </p> + <textarea id="newTextId" rows="20" cols="80" name="newText"><%=valueTextarea%></textarea> + + <label>Language : + <select id="language" name="langageSelection" onchange="changeModeBy(this)"> + <option value="null">Text</option> + <option value="rst">ReStructuredText</option> + <option value="javascript">Javascript</option> + <option value="text/html">HTML</option> + <option value="xml">XML</option> + </select> + </label> + + <% + + if(request.getAttribute("minetype")!=null && ( (String) request.getAttribute("minetype")).contains("rst") ) { + typeEditor="rst"; + %> + <script type='text/javascript'> + document.getElementById('language').selectedIndex=1 + </script> + <% + } + else if(request.getAttribute("minetype")!=null && ( (String) request.getAttribute("minetype")).contains("javascript")) { + typeEditor="javascript"; + %> + <script type='text/javascript'> + document.getElementById('language').selectedIndex=2 + </script> + <% + } + else if(request.getAttribute("minetype")!=null && ( (String) request.getAttribute("minetype")).contains("html") ) { + typeEditor="text/html"; + %> + <script type='text/javascript'> + document.getElementById('language').selectedIndex=3 + </script> + <% + } + else if(request.getAttribute("minetype")!=null && ( (String) request.getAttribute("minetype")).contains("xml") ) { + typeEditor="xml"; + %> + <script type='text/javascript'> + document.getElementById('language').selectedIndex=4 + </script> + <% + } + + else { + if (request.getAttribute("format")!=null && request.getAttribute("format").equals("rst")){ + typeEditor="rst"; + %> + <script type='text/javascript'> + document.getElementById('language').selectedIndex=1 + </script> + <% } else if(request.getAttribute("format")!=null && request.getAttribute("format").equals("javascript")) { + typeEditor="javascript"; + %> + <script type='text/javascript'> + document.getElementById('language').selectedIndex=2 + </script> + <% } else if(request.getAttribute("format")!=null && request.getAttribute("format").equals("html")) { + typeEditor="text/html"; + %> + <script type='text/javascript'> + document.getElementById('language').selectedIndex=3 + </script> + <% + } else if(request.getAttribute("format")!=null && request.getAttribute("format").equals("xml")) { + typeEditor="xml"; + %> + <script type='text/javascript'> + document.getElementById('language').selectedIndex=4 + </script> + <% + } + + } + + %> + + + + <script type="text/javascript"> + var textarea = document.getElementById('newTextId'); + var uiOptions = { path : 'codemirror-ui/js/', searchMode : 'popup' } + var codeMirrorOptions = { mode: "<%=typeEditor%>" } + var editor = new CodeMirrorUI(textarea,uiOptions,codeMirrorOptions); + </script> + + <script type="text/javascript"> + function changeModeBy(select){ + editor.mirror.setOption("mode",select.value); + //editor.reindent(); + } + </script> + <script type="text/javascript"> + function loadChange(){ + document.getElementById('newTextId').value = editor.mirror.getValue(); + } + </script> + + <script src="GereSession.js" type="text/javascript"></script> <script src="cancelRedirectDelete.js" type="text/javascript"></script> <script src="pictureUpload.js" type="text/javascript"></script> <noscript><h4>Javascript is not activated. You can't only use Save and Quit or Reset button.</h4></noscript> <noscript><h4>For a better use of SCMWebEditor please activate JavaScript.</h4></noscript> + <div id="formulaire"> + <div id="htmlcontentCommit"></div> <p>Commit Message: <input type="text" name="commitMessage" title="Let a commit message with this file."/></p> @@ -56,14 +203,14 @@ }%> <input type="hidden" name="address" value="<%=request.getAttribute("address")%>"/> <input type="hidden" name="origText" value="<%=request.getAttribute("OrigText")%>"/> - <% if(request.getAttribute("lastText")!=null) { %> - <input type="hidden" name="lastText" value="<%=request.getAttribute("lastText")%>" /> + <% if(request.getAttribute("lastText")!=null) { %> + <input type="hidden" name="lastText" value="<%=request.getAttribute("lastText")%>" /> <% } %> <input type="hidden" name="scmEditorUrl" value="<%=request.getAttribute("scmEditorUrl")%>"/> <s:url id="ajaxCommit" value="save.action" /> - <sj:submit + <sj:submit onclick="loadChange()" id="ajaxSaveButton" formIds="editForm" targets="htmlcontentCommit" @@ -99,10 +246,13 @@ <input type="hidden" value="<%=request.getAttribute("ProjectUrl")%>" name="ProjectUrl"> <input title="Exit ScmWebEditor without saving." type="button" value="Exit" name="Cancel" onclick="javascript:cancelRedirectDelete(this.form.origText, this.form.username, this.form.pw, this.form.commitMessage, this.form.ProjectUrl, this.form.scmEditorUrl);"/> + + <br/><button onClick="javascript:upload_popup('uploadForm.jsp','upload');" >Upload</button> + </div> </form> - <button onClick="javascript:upload_popup('uploadForm.jsp','upload');" >Upload</button> +  <sj:div id="htmlcontentUpload"></sj:div> - </center> + <div id="htmlcontentPreview"></div> Modified: trunk/src/main/webapp/OutConnection.jsp =================================================================== --- trunk/src/main/webapp/OutConnection.jsp 2011-06-24 14:18:08 UTC (rev 137) +++ trunk/src/main/webapp/OutConnection.jsp 2011-06-28 12:55:36 UTC (rev 138) @@ -45,9 +45,10 @@ <input type="submit" name="Save" /> </p> -<div id="htmlcontentSearch" ></div> + </form> </center> +<div id="htmlcontentSearch" ></div> <p align="right">©2004-2009 CodeLutin</p> </body> </html> Added: trunk/src/main/webapp/codemirror-ui/LICENSE =================================================================== --- trunk/src/main/webapp/codemirror-ui/LICENSE (rev 0) +++ trunk/src/main/webapp/codemirror-ui/LICENSE 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,19 @@ +Copyright (C) 2011 by Jeremy Green <jeremy(a)octolabs.com> + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. Added: trunk/src/main/webapp/codemirror-ui/README.md =================================================================== --- trunk/src/main/webapp/codemirror-ui/README.md (rev 0) +++ trunk/src/main/webapp/codemirror-ui/README.md 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,60 @@ +CodeMirror UI +============= + +CodeMirrorUI is a simple interface written by Jeremy Green to act as a +wrapper around the [CodeMirror](http://codemirror.net/) text editor widget by Marijn Haverbeke. +CodeMirror is a syntax highlighter and formatter that makes it much easier to edit source code in a browser. +CodeMirrorUI is a wrapper that adds interface functionality for many functions that are already built into CodeMirror itself. +Functionality includes undo, redo, jump to line, reindent selection, and reindent entire document. +Two options for find/replace are also available. It is based on the MirrorFrame example that Marijn included with CodeMirror. + +Demo +------------------- + +[http://www.octolabs.com/javascripts/codemirror-ui/index.html](http://www.octolabs.com/javascripts/codemirror-ui/index.html) + + +Easily Configurable +-------------------- + +It's easy to configure an editor with something like this: + + //first set up some variables + var textarea = document.getElementById('code1'); + var uiOptions = { path : 'js/', searchMode: 'popup' } + var codeMirrorOptions = { + mode: "javascript" // all your normal CodeMirror options go here + } + + //then create the editor + var editor = new CodeMirrorUI(textarea,uiOptions,codeMirrorOptions); + +Installation +-------------------- + + // First the CodeMirror stuff + <script src="lib/CodeMirror-2.0/lib/codemirror.js" type="text/javascript"></script> + <link rel="stylesheet" href="lib/CodeMirror-2.0/lib/codemirror.css"> + <script src="lib/CodeMirror-2.0/mode/javascript/javascript.js"></script> + <link rel="stylesheet" href="lib/CodeMirror-2.0/mode/javascript/javascript.css"> + + //Then the CodeMirrorUI stuff + <script src="js/codemirror-ui.js" type="text/javascript"></script> + <link rel="stylesheet" href="css/codemirror-ui.css" type="text/css" media="screen" /> + +You'll probably need to adjust the paths to fit your situation. + +Please see index.html for examples and many additional details. + +Acknowledgements +---------------------- + +Thanks to Marijn Haverbeke for creating and releasing [CodeMirror](http://codemirror.net/) in the first place. +Without his excellent contribution to the community this project would have no reason to exist. + +Thanks to Mark James of famfamfam.com for his [Silk Icons](http://www.famfamfam.com/lab/icons/silk/). + +License +---------------------- + +CodeMirror UI is provided under the MIT License. See the LICENSE file for full details. \ No newline at end of file Added: trunk/src/main/webapp/codemirror-ui/VERSION =================================================================== --- trunk/src/main/webapp/codemirror-ui/VERSION (rev 0) +++ trunk/src/main/webapp/codemirror-ui/VERSION 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,3 @@ +0.0.16 + + Added: trunk/src/main/webapp/codemirror-ui/css/codemirror-ui-find.css =================================================================== --- trunk/src/main/webapp/codemirror-ui/css/codemirror-ui-find.css (rev 0) +++ trunk/src/main/webapp/codemirror-ui/css/codemirror-ui-find.css 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,19 @@ +#buttons{ + float:right; +} + +#buttons a{ + + display:block; + text-align:center; + background:#ddd; + border:1px solid black; + color:black; + text-decoration:none; + padding:3px; + +} + +#buttons a:hover{ + background:white; +} \ No newline at end of file Added: trunk/src/main/webapp/codemirror-ui/css/codemirror-ui.css =================================================================== --- trunk/src/main/webapp/codemirror-ui/css/codemirror-ui.css (rev 0) +++ trunk/src/main/webapp/codemirror-ui/css/codemirror-ui.css 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,121 @@ +.codemirror-ui-button-frame{ + border:1px solid #ccc; + background:#eee; + position:relative; +} + +.codemirror-ui-button-frame input,.codemirror-ui-button-frame label{ + font-size:0.6em; +} + +.codemirror-ui-button-frame label input{ + margin:0px 2px; + vertical-align:middle; +} +.codemirror-ui-button-frame label{ + padding:0px; + margin:2px 5px; + margin-top:0px; + display:inline-block; +} + +input.codemirror-ui-checkbox{ + +} + +.codemirror-ui-button{ + display:block; + float:left; + padding:3px; + line-height:0; + margin:1px; + margin-right:0px; +} + +.codemirror-ui-button:hover{ + padding:2px; + border:1px solid #ccc; +} + +.codemirror-ui-button img{ + line-height:0; +} + +.codemirror-ui-button.inactive{ + -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; + filter: alpha(opacity=50); + opacity: .5; +} + +.codemirror-ui-wrap{ + float:right; +} + +.codemirror-find-replace{ + border:1px solid black; + background : #ddd; + padding:10px; + position:absolute; + width:300px; + top:0%; + left:50%; + margin-left:-150px; +} + +iframe{ + /*border:1px solid green !important;*/ +} + +.codemirror-ui-find-bar{ + text-align:center; +} + +.codemirror-ui-popup-find-wrap{ + position:absolute; + bottom:100%; + left:-1px; + border:1px solid #ccc; + background:#eee; + padding:2px 5px; + border-bottom:0px; + margin-bottom:-1px; + display:none; +} + +.codemirror-ui-popup-find-wrap.active{ + display:block; +} + + +.codemirror-ui-popup-find-wrap .codemirror-ui-button{ + float:left; +} + +.codemirror-ui-popup-find-wrap .codemirror-ui-find-bar{ + float:left; +} + +.CodeMirror{ + border:1px solid #ccc; + border-top:0px; + background:white; +} + +/* + * This lets us make sure that the fancy-tab-gutter will always enclose the tabs inside it. + * We're namspcing it since many frameworks include a .clearfix rule of somesort. + */ + +.codemirror-ui-clearfix:after { + visibility: hidden; + display: block; + font-size: 0; + content:"\0020"; + clear: both; + height: 0; + } +.codemirror-ui-clearfix { display: inline-block; } +/* start commented backslash hack \*/ +* html .codemirror-ui-clearfix { height: 1%; } +.codemirror-ui-clearfix { display: block; } +/* close commented backslash hack */ Added: trunk/src/main/webapp/codemirror-ui/images/octologo.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/octologo.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/accept.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/accept.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/anchor.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/anchor.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/application.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/application.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/application_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/application_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/application_cascade.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/application_cascade.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/application_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/application_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/application_double.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/application_double.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/application_edit.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/application_edit.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/application_error.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/application_error.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/application_form.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/application_form.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/application_form_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/application_form_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/application_form_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/application_form_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/application_form_edit.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/application_form_edit.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/application_form_magnify.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/application_form_magnify.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/application_get.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/application_get.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/application_go.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/application_go.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/application_home.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/application_home.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/application_key.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/application_key.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/application_lightning.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/application_lightning.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/application_link.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/application_link.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/application_osx.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/application_osx.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/application_osx_terminal.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/application_osx_terminal.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/application_put.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/application_put.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/application_side_boxes.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/application_side_boxes.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/application_side_contract.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/application_side_contract.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/application_side_expand.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/application_side_expand.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/application_side_list.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/application_side_list.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/application_side_tree.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/application_side_tree.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/application_split.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/application_split.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/application_tile_horizontal.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/application_tile_horizontal.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/application_tile_vertical.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/application_tile_vertical.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/application_view_columns.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/application_view_columns.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/application_view_detail.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/application_view_detail.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/application_view_gallery.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/application_view_gallery.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/application_view_icons.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/application_view_icons.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/application_view_list.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/application_view_list.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/application_view_tile.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/application_view_tile.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/application_xp.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/application_xp.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/application_xp_terminal.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/application_xp_terminal.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/arrow_branch.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/arrow_branch.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/arrow_divide.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/arrow_divide.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/arrow_down.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/arrow_down.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/arrow_in.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/arrow_in.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/arrow_inout.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/arrow_inout.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/arrow_join.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/arrow_join.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/arrow_left.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/arrow_left.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/arrow_merge.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/arrow_merge.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/arrow_out.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/arrow_out.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/arrow_out_diag.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/arrow_out_diag.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/arrow_redo.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/arrow_redo.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/arrow_refresh.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/arrow_refresh.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/arrow_refresh_small.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/arrow_refresh_small.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/arrow_right.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/arrow_right.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/arrow_rotate_anticlockwise.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/arrow_rotate_anticlockwise.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/arrow_rotate_clockwise.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/arrow_rotate_clockwise.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/arrow_switch.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/arrow_switch.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/arrow_turn_left.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/arrow_turn_left.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/arrow_turn_right.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/arrow_turn_right.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/arrow_undo.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/arrow_undo.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/arrow_up.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/arrow_up.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/asterisk_orange.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/asterisk_orange.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/asterisk_yellow.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/asterisk_yellow.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/attach.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/attach.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/award_star_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/award_star_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/award_star_bronze_1.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/award_star_bronze_1.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/award_star_bronze_2.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/award_star_bronze_2.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/award_star_bronze_3.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/award_star_bronze_3.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/award_star_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/award_star_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/award_star_gold_1.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/award_star_gold_1.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/award_star_gold_2.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/award_star_gold_2.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/award_star_gold_3.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/award_star_gold_3.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/award_star_silver_1.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/award_star_silver_1.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/award_star_silver_2.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/award_star_silver_2.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/award_star_silver_3.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/award_star_silver_3.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/basket.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/basket.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/basket_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/basket_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/basket_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/basket_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/basket_edit.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/basket_edit.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/basket_error.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/basket_error.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/basket_go.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/basket_go.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/basket_put.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/basket_put.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/basket_remove.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/basket_remove.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/bell.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/bell.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/bell_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/bell_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/bell_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/bell_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/bell_error.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/bell_error.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/bell_go.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/bell_go.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/bell_link.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/bell_link.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/bin.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/bin.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/bin_closed.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/bin_closed.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/bin_empty.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/bin_empty.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/bomb.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/bomb.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/book.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/book.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/book_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/book_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/book_addresses.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/book_addresses.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/book_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/book_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/book_edit.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/book_edit.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/book_error.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/book_error.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/book_go.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/book_go.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/book_key.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/book_key.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/book_link.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/book_link.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/book_next.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/book_next.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/book_open.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/book_open.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/book_previous.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/book_previous.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/box.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/box.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/brick.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/brick.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/brick_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/brick_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/brick_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/brick_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/brick_edit.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/brick_edit.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/brick_error.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/brick_error.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/brick_go.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/brick_go.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/brick_link.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/brick_link.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/bricks.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/bricks.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/briefcase.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/briefcase.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/bug.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/bug.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/bug_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/bug_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/bug_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/bug_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/bug_edit.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/bug_edit.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/bug_error.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/bug_error.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/bug_go.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/bug_go.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/bug_link.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/bug_link.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/building.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/building.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/building_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/building_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/building_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/building_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/building_edit.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/building_edit.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/building_error.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/building_error.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/building_go.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/building_go.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/building_key.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/building_key.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/building_link.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/building_link.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/bullet_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/bullet_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/bullet_arrow_bottom.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/bullet_arrow_bottom.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/bullet_arrow_down.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/bullet_arrow_down.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/bullet_arrow_top.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/bullet_arrow_top.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/bullet_arrow_up.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/bullet_arrow_up.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/bullet_black.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/bullet_black.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/bullet_blue.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/bullet_blue.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/bullet_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/bullet_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/bullet_disk.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/bullet_disk.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/bullet_error.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/bullet_error.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/bullet_feed.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/bullet_feed.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/bullet_go.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/bullet_go.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/bullet_green.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/bullet_green.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/bullet_key.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/bullet_key.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/bullet_orange.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/bullet_orange.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/bullet_picture.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/bullet_picture.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/bullet_pink.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/bullet_pink.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/bullet_purple.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/bullet_purple.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/bullet_red.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/bullet_red.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/bullet_star.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/bullet_star.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/bullet_toggle_minus.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/bullet_toggle_minus.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/bullet_toggle_plus.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/bullet_toggle_plus.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/bullet_white.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/bullet_white.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/bullet_wrench.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/bullet_wrench.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/bullet_yellow.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/bullet_yellow.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/cake.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/cake.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/calculator.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/calculator.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/calculator_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/calculator_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/calculator_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/calculator_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/calculator_edit.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/calculator_edit.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/calculator_error.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/calculator_error.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/calculator_link.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/calculator_link.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/calendar.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/calendar.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/calendar_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/calendar_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/calendar_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/calendar_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/calendar_edit.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/calendar_edit.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/calendar_link.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/calendar_link.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/calendar_view_day.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/calendar_view_day.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/calendar_view_month.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/calendar_view_month.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/calendar_view_week.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/calendar_view_week.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/camera.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/camera.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/camera_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/camera_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/camera_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/camera_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/camera_edit.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/camera_edit.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/camera_error.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/camera_error.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/camera_go.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/camera_go.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/camera_link.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/camera_link.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/camera_small.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/camera_small.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/cancel.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/cancel.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/car.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/car.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/car_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/car_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/car_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/car_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/cart.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/cart.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/cart_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/cart_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/cart_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/cart_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/cart_edit.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/cart_edit.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/cart_error.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/cart_error.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/cart_go.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/cart_go.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/cart_put.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/cart_put.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/cart_remove.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/cart_remove.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/cd.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/cd.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/cd_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/cd_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/cd_burn.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/cd_burn.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/cd_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/cd_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/cd_edit.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/cd_edit.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/cd_eject.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/cd_eject.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/cd_go.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/cd_go.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/chart_bar.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/chart_bar.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/chart_bar_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/chart_bar_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/chart_bar_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/chart_bar_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/chart_bar_edit.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/chart_bar_edit.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/chart_bar_error.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/chart_bar_error.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/chart_bar_link.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/chart_bar_link.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/chart_curve.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/chart_curve.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/chart_curve_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/chart_curve_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/chart_curve_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/chart_curve_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/chart_curve_edit.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/chart_curve_edit.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/chart_curve_error.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/chart_curve_error.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/chart_curve_go.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/chart_curve_go.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/chart_curve_link.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/chart_curve_link.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/chart_line.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/chart_line.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/chart_line_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/chart_line_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/chart_line_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/chart_line_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/chart_line_edit.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/chart_line_edit.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/chart_line_error.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/chart_line_error.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/chart_line_link.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/chart_line_link.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/chart_organisation.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/chart_organisation.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/chart_organisation_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/chart_organisation_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/chart_organisation_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/chart_organisation_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/chart_pie.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/chart_pie.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/chart_pie_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/chart_pie_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/chart_pie_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/chart_pie_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/chart_pie_edit.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/chart_pie_edit.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/chart_pie_error.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/chart_pie_error.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/chart_pie_link.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/chart_pie_link.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/clock.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/clock.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/clock_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/clock_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/clock_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/clock_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/clock_edit.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/clock_edit.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/clock_error.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/clock_error.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/clock_go.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/clock_go.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/clock_link.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/clock_link.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/clock_pause.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/clock_pause.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/clock_play.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/clock_play.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/clock_red.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/clock_red.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/clock_stop.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/clock_stop.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/cog.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/cog.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/cog_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/cog_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/cog_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/cog_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/cog_edit.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/cog_edit.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/cog_error.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/cog_error.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/cog_go.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/cog_go.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/coins.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/coins.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/coins_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/coins_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/coins_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/coins_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/color_swatch.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/color_swatch.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/color_wheel.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/color_wheel.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/comment.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/comment.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/comment_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/comment_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/comment_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/comment_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/comment_edit.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/comment_edit.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/comments.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/comments.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/comments_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/comments_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/comments_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/comments_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/compress.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/compress.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/computer.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/computer.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/computer_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/computer_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/computer_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/computer_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/computer_edit.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/computer_edit.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/computer_error.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/computer_error.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/computer_go.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/computer_go.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/computer_key.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/computer_key.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/computer_link.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/computer_link.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/connect.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/connect.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/contrast.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/contrast.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/contrast_decrease.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/contrast_decrease.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/contrast_high.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/contrast_high.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/contrast_increase.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/contrast_increase.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/contrast_low.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/contrast_low.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/control_eject.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/control_eject.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/control_eject_blue.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/control_eject_blue.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/control_end.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/control_end.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/control_end_blue.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/control_end_blue.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/control_equalizer.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/control_equalizer.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/control_equalizer_blue.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/control_equalizer_blue.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/control_fastforward.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/control_fastforward.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/control_fastforward_blue.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/control_fastforward_blue.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/control_pause.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/control_pause.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/control_pause_blue.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/control_pause_blue.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/control_play.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/control_play.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/control_play_blue.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/control_play_blue.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/control_repeat.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/control_repeat.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/control_repeat_blue.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/control_repeat_blue.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/control_rewind.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/control_rewind.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/control_rewind_blue.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/control_rewind_blue.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/control_start.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/control_start.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/control_start_blue.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/control_start_blue.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/control_stop.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/control_stop.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/control_stop_blue.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/control_stop_blue.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/controller.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/controller.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/controller_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/controller_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/controller_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/controller_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/controller_error.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/controller_error.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/creditcards.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/creditcards.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/cross.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/cross.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/css.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/css.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/css_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/css_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/css_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/css_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/css_go.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/css_go.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/css_valid.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/css_valid.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/cup.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/cup.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/cup_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/cup_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/cup_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/cup_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/cup_edit.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/cup_edit.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/cup_error.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/cup_error.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/cup_go.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/cup_go.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/cup_key.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/cup_key.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/cup_link.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/cup_link.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/cursor.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/cursor.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/cut.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/cut.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/cut_red.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/cut_red.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/database.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/database.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/database_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/database_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/database_connect.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/database_connect.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/database_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/database_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/database_edit.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/database_edit.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/database_error.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/database_error.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/database_gear.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/database_gear.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/database_go.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/database_go.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/database_key.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/database_key.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/database_lightning.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/database_lightning.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/database_link.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/database_link.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/database_refresh.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/database_refresh.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/database_save.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/database_save.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/database_table.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/database_table.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/date.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/date.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/date_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/date_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/date_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/date_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/date_edit.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/date_edit.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/date_error.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/date_error.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/date_go.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/date_go.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/date_link.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/date_link.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/date_magnify.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/date_magnify.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/date_next.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/date_next.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/date_previous.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/date_previous.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/disconnect.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/disconnect.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/disk.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/disk.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/disk_multiple.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/disk_multiple.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/door.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/door.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/door_in.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/door_in.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/door_open.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/door_open.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/door_out.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/door_out.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/drink.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/drink.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/drink_empty.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/drink_empty.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/drive.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/drive.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/drive_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/drive_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/drive_burn.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/drive_burn.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/drive_cd.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/drive_cd.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/drive_cd_empty.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/drive_cd_empty.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/drive_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/drive_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/drive_disk.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/drive_disk.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/drive_edit.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/drive_edit.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/drive_error.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/drive_error.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/drive_go.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/drive_go.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/drive_key.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/drive_key.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/drive_link.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/drive_link.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/drive_magnify.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/drive_magnify.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/drive_network.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/drive_network.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/drive_rename.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/drive_rename.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/drive_user.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/drive_user.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/drive_web.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/drive_web.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/dvd.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/dvd.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/dvd_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/dvd_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/dvd_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/dvd_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/dvd_edit.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/dvd_edit.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/dvd_error.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/dvd_error.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/dvd_go.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/dvd_go.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/dvd_key.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/dvd_key.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/dvd_link.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/dvd_link.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/email.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/email.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/email_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/email_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/email_attach.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/email_attach.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/email_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/email_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/email_edit.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/email_edit.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/email_error.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/email_error.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/email_go.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/email_go.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/email_link.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/email_link.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/email_open.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/email_open.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/email_open_image.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/email_open_image.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/emoticon_evilgrin.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/emoticon_evilgrin.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/emoticon_grin.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/emoticon_grin.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/emoticon_happy.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/emoticon_happy.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/emoticon_smile.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/emoticon_smile.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/emoticon_surprised.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/emoticon_surprised.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/emoticon_tongue.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/emoticon_tongue.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/emoticon_unhappy.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/emoticon_unhappy.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/emoticon_waii.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/emoticon_waii.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/emoticon_wink.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/emoticon_wink.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/error.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/error.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/error_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/error_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/error_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/error_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/error_go.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/error_go.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/exclamation.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/exclamation.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/eye.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/eye.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/feed.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/feed.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/feed_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/feed_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/feed_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/feed_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/feed_disk.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/feed_disk.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/feed_edit.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/feed_edit.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/feed_error.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/feed_error.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/feed_go.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/feed_go.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/feed_key.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/feed_key.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/feed_link.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/feed_link.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/feed_magnify.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/feed_magnify.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/female.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/female.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/film.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/film.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/film_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/film_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/film_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/film_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/film_edit.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/film_edit.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/film_error.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/film_error.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/film_go.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/film_go.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/film_key.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/film_key.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/film_link.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/film_link.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/film_save.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/film_save.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/find.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/find.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/flag_blue.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/flag_blue.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/flag_green.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/flag_green.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/flag_orange.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/flag_orange.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/flag_pink.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/flag_pink.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/flag_purple.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/flag_purple.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/flag_red.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/flag_red.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/flag_yellow.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/flag_yellow.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/folder.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/folder.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/folder_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/folder_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/folder_bell.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/folder_bell.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/folder_brick.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/folder_brick.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/folder_bug.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/folder_bug.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/folder_camera.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/folder_camera.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/folder_database.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/folder_database.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/folder_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/folder_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/folder_edit.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/folder_edit.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/folder_error.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/folder_error.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/folder_explore.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/folder_explore.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/folder_feed.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/folder_feed.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/folder_find.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/folder_find.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/folder_go.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/folder_go.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/folder_heart.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/folder_heart.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/folder_image.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/folder_image.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/folder_key.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/folder_key.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/folder_lightbulb.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/folder_lightbulb.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/folder_link.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/folder_link.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/folder_magnify.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/folder_magnify.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/folder_page.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/folder_page.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/folder_page_white.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/folder_page_white.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/folder_palette.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/folder_palette.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/folder_picture.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/folder_picture.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/folder_star.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/folder_star.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/folder_table.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/folder_table.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/folder_user.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/folder_user.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/folder_wrench.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/folder_wrench.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/font.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/font.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/font_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/font_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/font_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/font_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/font_go.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/font_go.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/group.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/group.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/group_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/group_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/group_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/group_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/group_edit.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/group_edit.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/group_error.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/group_error.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/group_gear.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/group_gear.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/group_go.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/group_go.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/group_key.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/group_key.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/group_link.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/group_link.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/heart.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/heart.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/heart_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/heart_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/heart_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/heart_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/help.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/help.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/hourglass.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/hourglass.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/hourglass_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/hourglass_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/hourglass_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/hourglass_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/hourglass_go.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/hourglass_go.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/hourglass_link.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/hourglass_link.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/house.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/house.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/house_go.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/house_go.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/house_link.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/house_link.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/html.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/html.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/html_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/html_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/html_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/html_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/html_go.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/html_go.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/html_valid.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/html_valid.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/image.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/image.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/image_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/image_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/image_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/image_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/image_edit.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/image_edit.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/image_link.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/image_link.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/images.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/images.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/information.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/information.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/ipod.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/ipod.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/ipod_cast.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/ipod_cast.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/ipod_cast_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/ipod_cast_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/ipod_cast_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/ipod_cast_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/ipod_sound.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/ipod_sound.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/joystick.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/joystick.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/joystick_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/joystick_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/joystick_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/joystick_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/joystick_error.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/joystick_error.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/key.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/key.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/key_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/key_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/key_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/key_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/key_go.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/key_go.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/keyboard.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/keyboard.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/keyboard_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/keyboard_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/keyboard_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/keyboard_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/keyboard_magnify.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/keyboard_magnify.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/layers.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/layers.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/layout.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/layout.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/layout_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/layout_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/layout_content.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/layout_content.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/layout_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/layout_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/layout_edit.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/layout_edit.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/layout_error.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/layout_error.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/layout_header.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/layout_header.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/layout_link.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/layout_link.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/layout_sidebar.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/layout_sidebar.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/lightbulb.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/lightbulb.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/lightbulb_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/lightbulb_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/lightbulb_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/lightbulb_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/lightbulb_off.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/lightbulb_off.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/lightning.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/lightning.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/lightning_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/lightning_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/lightning_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/lightning_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/lightning_go.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/lightning_go.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/link.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/link.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/link_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/link_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/link_break.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/link_break.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/link_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/link_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/link_edit.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/link_edit.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/link_error.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/link_error.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/link_go.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/link_go.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/lock.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/lock.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/lock_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/lock_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/lock_break.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/lock_break.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/lock_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/lock_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/lock_edit.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/lock_edit.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/lock_go.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/lock_go.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/lock_open.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/lock_open.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/lorry.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/lorry.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/lorry_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/lorry_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/lorry_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/lorry_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/lorry_error.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/lorry_error.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/lorry_flatbed.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/lorry_flatbed.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/lorry_go.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/lorry_go.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/lorry_link.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/lorry_link.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/magifier_zoom_out.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/magifier_zoom_out.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/magnifier.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/magnifier.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/magnifier_zoom_in.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/magnifier_zoom_in.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/male.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/male.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/map.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/map.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/map_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/map_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/map_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/map_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/map_edit.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/map_edit.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/map_go.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/map_go.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/map_magnify.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/map_magnify.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/medal_bronze_1.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/medal_bronze_1.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/medal_bronze_2.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/medal_bronze_2.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/medal_bronze_3.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/medal_bronze_3.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/medal_bronze_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/medal_bronze_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/medal_bronze_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/medal_bronze_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/medal_gold_1.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/medal_gold_1.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/medal_gold_2.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/medal_gold_2.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/medal_gold_3.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/medal_gold_3.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/medal_gold_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/medal_gold_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/medal_gold_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/medal_gold_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/medal_silver_1.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/medal_silver_1.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/medal_silver_2.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/medal_silver_2.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/medal_silver_3.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/medal_silver_3.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/medal_silver_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/medal_silver_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/medal_silver_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/medal_silver_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/money.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/money.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/money_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/money_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/money_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/money_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/money_dollar.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/money_dollar.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/money_euro.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/money_euro.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/money_pound.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/money_pound.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/money_yen.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/money_yen.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/monitor.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/monitor.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/monitor_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/monitor_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/monitor_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/monitor_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/monitor_edit.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/monitor_edit.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/monitor_error.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/monitor_error.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/monitor_go.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/monitor_go.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/monitor_lightning.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/monitor_lightning.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/monitor_link.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/monitor_link.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/mouse.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/mouse.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/mouse_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/mouse_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/mouse_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/mouse_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/mouse_error.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/mouse_error.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/music.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/music.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/new.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/new.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/newspaper.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/newspaper.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/newspaper_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/newspaper_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/newspaper_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/newspaper_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/newspaper_go.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/newspaper_go.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/newspaper_link.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/newspaper_link.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/note.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/note.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/note_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/note_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/note_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/note_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/note_edit.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/note_edit.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/note_error.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/note_error.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/note_go.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/note_go.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/overlays.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/overlays.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/package.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/package.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/package_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/package_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/package_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/package_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/package_go.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/package_go.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/package_green.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/package_green.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/package_link.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/package_link.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_attach.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_attach.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_code.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_code.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_copy.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_copy.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_edit.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_edit.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_error.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_error.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_excel.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_excel.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_find.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_find.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_gear.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_gear.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_go.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_go.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_green.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_green.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_key.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_key.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_lightning.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_lightning.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_link.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_link.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_paintbrush.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_paintbrush.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_paste.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_paste.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_red.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_red.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_refresh.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_refresh.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_save.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_save.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_white.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_white.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_acrobat.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_acrobat.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_actionscript.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_actionscript.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_c.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_c.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_camera.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_camera.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_cd.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_cd.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_code.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_code.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_code_red.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_code_red.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_coldfusion.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_coldfusion.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_compressed.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_compressed.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_copy.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_copy.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_cplusplus.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_cplusplus.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_csharp.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_csharp.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_cup.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_cup.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_database.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_database.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_dvd.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_dvd.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_edit.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_edit.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_error.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_error.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_excel.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_excel.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_find.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_find.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_flash.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_flash.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_freehand.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_freehand.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_gear.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_gear.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_get.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_get.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_go.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_go.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_h.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_h.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_horizontal.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_horizontal.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_key.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_key.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_lightning.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_lightning.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_link.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_link.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_magnify.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_magnify.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_medal.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_medal.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_office.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_office.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_paint.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_paint.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_paintbrush.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_paintbrush.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_paste.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_paste.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_php.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_php.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_picture.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_picture.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_powerpoint.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_powerpoint.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_put.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_put.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_ruby.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_ruby.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_stack.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_stack.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_star.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_star.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_swoosh.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_swoosh.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_text.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_text.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_text_width.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_text_width.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_tux.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_tux.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_vector.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_vector.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_visualstudio.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_visualstudio.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_width.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_width.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_word.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_word.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_world.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_world.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_wrench.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_wrench.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_zip.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_white_zip.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_word.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_word.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/page_world.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/page_world.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/paintbrush.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/paintbrush.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/paintcan.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/paintcan.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/palette.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/palette.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/paste_plain.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/paste_plain.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/paste_word.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/paste_word.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/pencil.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/pencil.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/pencil_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/pencil_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/pencil_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/pencil_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/pencil_go.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/pencil_go.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/phone.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/phone.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/phone_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/phone_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/phone_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/phone_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/phone_sound.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/phone_sound.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/photo.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/photo.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/photo_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/photo_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/photo_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/photo_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/photo_link.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/photo_link.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/photos.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/photos.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/picture.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/picture.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/picture_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/picture_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/picture_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/picture_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/picture_edit.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/picture_edit.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/picture_empty.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/picture_empty.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/picture_error.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/picture_error.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/picture_go.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/picture_go.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/picture_key.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/picture_key.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/picture_link.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/picture_link.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/picture_save.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/picture_save.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/pictures.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/pictures.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/pilcrow.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/pilcrow.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/pill.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/pill.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/pill_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/pill_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/pill_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/pill_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/pill_go.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/pill_go.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/plugin.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/plugin.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/plugin_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/plugin_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/plugin_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/plugin_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/plugin_disabled.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/plugin_disabled.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/plugin_edit.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/plugin_edit.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/plugin_error.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/plugin_error.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/plugin_go.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/plugin_go.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/plugin_link.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/plugin_link.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/printer.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/printer.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/printer_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/printer_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/printer_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/printer_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/printer_empty.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/printer_empty.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/printer_error.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/printer_error.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/rainbow.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/rainbow.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/report.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/report.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/report_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/report_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/report_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/report_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/report_disk.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/report_disk.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/report_edit.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/report_edit.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/report_go.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/report_go.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/report_key.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/report_key.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/report_link.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/report_link.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/report_magnify.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/report_magnify.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/report_picture.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/report_picture.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/report_user.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/report_user.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/report_word.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/report_word.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/resultset_first.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/resultset_first.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/resultset_last.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/resultset_last.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/resultset_next.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/resultset_next.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/resultset_previous.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/resultset_previous.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/rosette.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/rosette.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/rss.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/rss.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/rss_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/rss_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/rss_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/rss_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/rss_go.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/rss_go.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/rss_valid.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/rss_valid.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/ruby.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/ruby.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/ruby_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/ruby_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/ruby_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/ruby_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/ruby_gear.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/ruby_gear.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/ruby_get.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/ruby_get.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/ruby_go.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/ruby_go.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/ruby_key.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/ruby_key.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/ruby_link.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/ruby_link.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/ruby_put.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/ruby_put.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/script.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/script.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/script_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/script_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/script_code.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/script_code.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/script_code_red.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/script_code_red.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/script_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/script_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/script_edit.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/script_edit.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/script_error.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/script_error.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/script_gear.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/script_gear.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/script_go.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/script_go.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/script_key.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/script_key.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/script_lightning.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/script_lightning.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/script_link.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/script_link.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/script_palette.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/script_palette.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/script_save.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/script_save.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/server.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/server.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/server_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/server_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/server_chart.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/server_chart.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/server_compressed.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/server_compressed.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/server_connect.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/server_connect.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/server_database.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/server_database.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/server_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/server_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/server_edit.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/server_edit.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/server_error.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/server_error.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/server_go.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/server_go.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/server_key.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/server_key.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/server_lightning.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/server_lightning.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/server_link.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/server_link.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/server_uncompressed.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/server_uncompressed.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/shading.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/shading.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/shape_align_bottom.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/shape_align_bottom.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/shape_align_center.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/shape_align_center.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/shape_align_left.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/shape_align_left.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/shape_align_middle.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/shape_align_middle.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/shape_align_right.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/shape_align_right.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/shape_align_top.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/shape_align_top.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/shape_flip_horizontal.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/shape_flip_horizontal.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/shape_flip_vertical.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/shape_flip_vertical.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/shape_group.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/shape_group.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/shape_handles.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/shape_handles.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/shape_move_back.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/shape_move_back.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/shape_move_backwards.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/shape_move_backwards.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/shape_move_forwards.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/shape_move_forwards.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/shape_move_front.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/shape_move_front.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/shape_rotate_anticlockwise.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/shape_rotate_anticlockwise.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/shape_rotate_clockwise.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/shape_rotate_clockwise.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/shape_square.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/shape_square.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/shape_square_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/shape_square_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/shape_square_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/shape_square_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/shape_square_edit.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/shape_square_edit.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/shape_square_error.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/shape_square_error.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/shape_square_go.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/shape_square_go.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/shape_square_key.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/shape_square_key.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/shape_square_link.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/shape_square_link.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/shape_ungroup.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/shape_ungroup.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/shield.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/shield.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/shield_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/shield_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/shield_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/shield_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/shield_go.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/shield_go.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/sitemap.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/sitemap.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/sitemap_color.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/sitemap_color.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/sound.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/sound.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/sound_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/sound_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/sound_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/sound_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/sound_low.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/sound_low.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/sound_mute.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/sound_mute.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/sound_none.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/sound_none.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/spellcheck.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/spellcheck.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/sport_8ball.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/sport_8ball.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/sport_basketball.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/sport_basketball.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/sport_football.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/sport_football.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/sport_golf.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/sport_golf.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/sport_raquet.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/sport_raquet.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/sport_shuttlecock.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/sport_shuttlecock.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/sport_soccer.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/sport_soccer.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/sport_tennis.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/sport_tennis.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/star.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/star.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/status_away.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/status_away.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/status_busy.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/status_busy.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/status_offline.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/status_offline.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/status_online.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/status_online.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/stop.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/stop.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/style.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/style.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/style_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/style_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/style_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/style_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/style_edit.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/style_edit.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/style_go.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/style_go.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/sum.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/sum.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/tab.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/tab.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/tab_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/tab_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/tab_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/tab_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/tab_edit.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/tab_edit.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/tab_go.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/tab_go.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/table.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/table.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/table_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/table_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/table_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/table_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/table_edit.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/table_edit.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/table_error.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/table_error.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/table_gear.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/table_gear.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/table_go.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/table_go.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/table_key.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/table_key.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/table_lightning.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/table_lightning.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/table_link.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/table_link.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/table_multiple.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/table_multiple.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/table_refresh.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/table_refresh.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/table_relationship.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/table_relationship.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/table_row_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/table_row_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/table_row_insert.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/table_row_insert.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/table_save.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/table_save.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/table_sort.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/table_sort.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/tag.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/tag.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/tag_blue.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/tag_blue.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/tag_blue_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/tag_blue_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/tag_blue_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/tag_blue_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/tag_blue_edit.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/tag_blue_edit.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/tag_green.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/tag_green.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/tag_orange.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/tag_orange.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/tag_pink.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/tag_pink.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/tag_purple.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/tag_purple.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/tag_red.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/tag_red.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/tag_yellow.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/tag_yellow.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/telephone.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/telephone.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/telephone_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/telephone_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/telephone_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/telephone_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/telephone_edit.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/telephone_edit.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/telephone_error.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/telephone_error.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/telephone_go.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/telephone_go.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/telephone_key.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/telephone_key.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/telephone_link.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/telephone_link.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/television.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/television.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/television_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/television_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/television_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/television_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/text_align_center.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/text_align_center.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/text_align_justify.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/text_align_justify.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/text_align_left.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/text_align_left.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/text_align_right.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/text_align_right.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/text_allcaps.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/text_allcaps.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/text_bold.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/text_bold.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/text_columns.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/text_columns.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/text_dropcaps.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/text_dropcaps.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/text_heading_1.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/text_heading_1.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/text_heading_2.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/text_heading_2.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/text_heading_3.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/text_heading_3.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/text_heading_4.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/text_heading_4.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/text_heading_5.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/text_heading_5.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/text_heading_6.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/text_heading_6.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/text_horizontalrule.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/text_horizontalrule.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/text_indent.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/text_indent.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/text_indent_remove.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/text_indent_remove.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/text_italic.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/text_italic.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/text_kerning.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/text_kerning.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/text_letter_omega.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/text_letter_omega.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/text_letterspacing.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/text_letterspacing.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/text_linespacing.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/text_linespacing.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/text_list_bullets.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/text_list_bullets.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/text_list_numbers.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/text_list_numbers.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/text_lowercase.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/text_lowercase.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/text_padding_bottom.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/text_padding_bottom.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/text_padding_left.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/text_padding_left.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/text_padding_right.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/text_padding_right.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/text_padding_top.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/text_padding_top.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/text_replace.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/text_replace.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/text_signature.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/text_signature.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/text_smallcaps.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/text_smallcaps.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/text_strikethrough.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/text_strikethrough.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/text_subscript.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/text_subscript.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/text_superscript.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/text_superscript.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/text_underline.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/text_underline.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/text_uppercase.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/text_uppercase.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/textfield.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/textfield.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/textfield_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/textfield_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/textfield_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/textfield_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/textfield_key.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/textfield_key.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/textfield_rename.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/textfield_rename.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/thumb_down.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/thumb_down.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/thumb_up.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/thumb_up.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/tick.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/tick.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/time.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/time.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/time_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/time_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/time_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/time_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/time_go.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/time_go.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/timeline_marker.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/timeline_marker.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/transmit.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/transmit.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/transmit_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/transmit_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/transmit_blue.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/transmit_blue.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/transmit_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/transmit_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/transmit_edit.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/transmit_edit.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/transmit_error.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/transmit_error.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/transmit_go.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/transmit_go.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/tux.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/tux.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/user.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/user.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/user_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/user_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/user_comment.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/user_comment.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/user_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/user_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/user_edit.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/user_edit.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/user_female.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/user_female.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/user_go.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/user_go.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/user_gray.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/user_gray.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/user_green.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/user_green.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/user_orange.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/user_orange.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/user_red.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/user_red.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/user_suit.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/user_suit.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/vcard.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/vcard.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/vcard_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/vcard_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/vcard_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/vcard_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/vcard_edit.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/vcard_edit.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/vector.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/vector.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/vector_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/vector_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/vector_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/vector_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/wand.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/wand.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/weather_clouds.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/weather_clouds.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/weather_cloudy.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/weather_cloudy.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/weather_lightning.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/weather_lightning.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/weather_rain.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/weather_rain.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/weather_snow.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/weather_snow.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/weather_sun.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/weather_sun.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/webcam.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/webcam.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/webcam_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/webcam_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/webcam_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/webcam_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/webcam_error.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/webcam_error.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/world.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/world.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/world_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/world_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/world_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/world_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/world_edit.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/world_edit.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/world_go.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/world_go.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/world_link.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/world_link.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/wrench.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/wrench.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/wrench_orange.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/wrench_orange.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/xhtml.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/xhtml.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/xhtml_add.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/xhtml_add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/xhtml_delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/xhtml_delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/xhtml_go.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/xhtml_go.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/xhtml_valid.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/xhtml_valid.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/zoom.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/zoom.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/zoom_in.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/zoom_in.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/images/silk/zoom_out.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/images/silk/zoom_out.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/index.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/index.html (rev 0) +++ trunk/src/main/webapp/codemirror-ui/index.html 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,331 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" lang="en"> +<head> + + <title>CodeMirror UI | Test Page</title> + + <script src="lib/CodeMirror-2.0/lib/codemirror.js" type="text/javascript"></script> + <link rel="stylesheet" href="lib/CodeMirror-2.0/lib/codemirror.css"> + <script src="lib/CodeMirror-2.0/mode/javascript/javascript.js"></script> + <link rel="stylesheet" href="lib/CodeMirror-2.0/mode/javascript/javascript.css"> + + + <script src="js/codemirror-ui.js" type="text/javascript"></script> + <link rel="stylesheet" href="css/codemirror-ui.css" type="text/css" media="screen" /> + + <style type="text/css"> + body{ + background:#0d4664; + text-align:center; + } + + #pageBody{ + width:930px; + padding:10px; + background:white; + text-align:left; + margin:10px auto; + padding-top:0px; + border:1px solid black; + -webkit-border-radius: 15px; + -moz-border-radius: 15px; + border-radius: 15px; + -moz-box-shadow: 3px 3px 14px #000; + -webkit-box-shadow: 3px 3px 14px #000; + box-shadow: 3px 3px 14px #000; + } + + pre{ + border:1px solid #ccc; + background:#eee; + padding:10px; + } + + #footer{ + font-size:0.9em; + color:white; + } + #footer a{ + color:white; + } + </style> + + +</head> +<body> + +<div id="pageBody"> + <h1>CodeMirror UI</h1> + + <p> + CodeMirrorUI is a simple interface written by Jeremy Green to act as a + wrapper around the <a href="http://codemirror.net/">CodeMirror</a> text editor widget by Marijn Haverbeke. + CodeMirror is a syntax highlighter and formatter that makes it much easier to edit source code in a browser. + ComeMirrorUI is a wrapper that adds interface functionality for many functions that are already built into CodeMirror itself. + Functionality includes undo, redo, jump to line, reindent selection, and reindent entire document. + Two options for find/replace are also available. It is based on the MirrorFrame example that Marijn included with CodeMirror. + </p> + <p> + This editor is enabled with the pop up find/replace widget. + </p> +  + + <textarea id="code1" cols="120" rows="20"> + // Here you see some JavaScript code. Mess around with it to get + // acquainted with CodeMirror's features. + + // Press enter inside the object and your new line will be suitably + // indented. + var keyBindings = { + enter: "newline-and-indent", + tab: "reindent-selection", + ctrl_z: "undo", + ctrl_y: "redo", + ctrl_backspace: "undo-for-safari (which blocks ctrl-z)", + ctrl_bracket: "highlight-brackets", + ctrl_shift_bracket: "jump-to-matching-bracket" + }; + + // Press tab on the next line and the wrong indentation will be fixed. + var regex = /foo|bar/i; + + function example(x) { + // Local variables get a different colour than global ones. + var y = 44.4; + return x + y - z; + } + </textarea> + + <h2>Easily Configurable</h2> + + <p> + The editor above was created with code like this: + </p> + + <pre> +//first set up some variables +var textarea = document.getElementById('code1'); +var uiOptions = { path : 'js/', searchMode : 'popup' } +var codeMirrorOptions = { mode: "javascript" } + +//then create the editor +var editor = new CodeMirrorUI(textarea,uiOptions,codeMirrorOptions); </pre> + + <p> + Creating a new CodeMirrorUI is easy, you just call: + </p> + <pre>new CodeMirrorUI(textarea,uiOptions,codeMirrorOptions);</pre> + + <h3>Params for new CodeMirrorUI()</h3> + <ul> + <li> + textarea - Either a DOM element of the ID of a DOM element that should be replaced with the editor UI. + </li> + <li> + uiOptions - Options for the CodeMirrorUI object. + <ul> + <li> + path - String - The path to the codemirror-ui js directory (relative to the current document). + </li> + <li> + searchMode - String - Options are 'inline' or 'popup' + </li> + <li> + buttons - Array - An array of button names that should be included in the button bar. + </li> + </ul> + </li> + <li> + codeMirrorOptions - Standard optiosn that you would pass to any CodeMirror constructor. See the <a href="http://codemirror.net/manual.html">CodeMirror manual</a> for more details; + </li> + </ul> + <h2>Installing</h2> + + <p> + To install CodeMirrorUI you can just copy the codemirror-ui directory into your web app. + It includes a version of CodeMirror, or you can use your own version if you'd prefer. + </p> + <p> + Then include a link to the stylesheet and javascript files in your document. Something like this: + </p> + +<pre class="code"> +// First the CodeMirror stuff +<script src="lib/CodeMirror-2.0/lib/codemirror.js" type="text/javascript"></script> +<link rel="stylesheet" href="lib/CodeMirror-2.0/lib/codemirror.css"> +<script src="lib/CodeMirror-2.0/mode/javascript/javascript.js"></script> +<link rel="stylesheet" href="lib/CodeMirror-2.0/mode/javascript/javascript.css"> + +//Then the CodeMirrorUI stuff +<script src="js/codemirror-ui.js" type="text/javascript"></script> +<link rel="stylesheet" href="css/codemirror-ui.css" type="text/css" media="screen" /> +</pre> + + <p> + From there you can create an editor as shown above. It is especially easy to replace any calls to + "CodeMirror.fromTextArea(...)" with a "new CodeMirrorUI(...)". + </p> + + <h2>Another example</h2> + + <p> + This editor is enabled with the 'inline' search widget. + </p> + <p> + The button for the popup search widget has been removed, + along with the button for 'reindent selection'. + </p> + <textarea id="code2" cols="120" rows="30"> + // Here you see some JavaScript code. Mess around with it to get + // acquainted with CodeMirror's features. + + // Press enter inside the object and your new line will be suitably + // indented. + var keyBindings = { + enter: "newline-and-indent", + tab: "reindent-selection", + ctrl_z: "undo", + ctrl_y: "redo", + ctrl_backspace: "undo-for-safari (which blocks ctrl-z)", + ctrl_bracket: "highlight-brackets", + ctrl_shift_bracket: "jump-to-matching-bracket" + }; + + // Press tab on the next line and the wrong indentation will be fixed. + var regex = /foo|bar/i; + + function example(x) { + // Local variables get a different colour than global ones. + var y = 44.4; + return x + y - z; + } + </textarea> + + <p> + The uiOptions param for the editor above looks like this: + </p> + + +<pre class="code"> +var uiOptions = { + path : 'js/', + searchMode = 'inline', + buttons : ['undo','redo','jump','reindent','about'] +} +</pre> + + <p> + View the source of this page to see the actual code used to get these editors in action. + </p> + + + <h2>Find the code @ Github</h2> + <a href="https://github.com/jagthedrummer/codemirror-ui">https://github.com/jagthedrummer/codemirror-ui</a> + + <h2>Acknowledgements</h2> + <h3><a href="http://codemirror.net/">Marijn Haverbeke - CodeMirror</a></h3> + <p> + Thanks to Marijn Haverbeke for creating and releasing CodeMirror in the first place. + Whithout his excellent contribution to the community this project would have no reason to exist. + </p> + + <h3><a href="http://www.famfamfam.com/lab/icons/silk/">Mark James - Silk Icons</a></h3> + <p> + I used the Silk icon set from Mark James of <a href="http://www.famfamfam.com/">famfamfam.com</a> fame. + </p> + + <h2>Versions</h2> + <p> + All version up to and including 0.0.7 are based on CodeMirror 1. + </p> + <p> + Versions 0.0.8 and newer are based on CodeMirror 2. + </p> + + <h2>License</h2> + + <p> + CodeMirror UI is provided under the MIT License. See the LICENSE file for full details. + </p> + + <h2>Known Usage</h2> + <p> + The following sites/apps are using CodeMirrorUI. + Please let me know if you'd like to be added to this list. + </p> + <ul> + <li><a href="http://www.webapeel.com/">aPeel</a></li> + </ul> +</div> + + + <div id="footer"> + CodeMirrorUI is a production of <a href="http://www.octolabs.com/">OctoLabs</a> + <br/> + <a href="http://www.octolabs.com/"><img src="images/octologo.png" border="0"></a> + </div> + + +<script type="text/javascript"> + + /* + var textarea = document.getElementById('code0'); + var myCodeMirror = CodeMirror.fromTextArea(textarea, {mode: "javascript"} ); + */ + + var textarea = document.getElementById('code1'); + var editor = new CodeMirrorUI(textarea, + { + path : 'js/', + searchMode : 'popup' + }, + { + mode: "javascript" + }); + + + var textarea2 = document.getElementById('code2'); + //CodeMirror.replace(textarea); + + var editor2 = new CodeMirrorUI(textarea2, + { + path : 'js/', + searchMode : 'inline', + buttons : ['undo','redo','jump','reindent','about'] + }, + { + mode: "javascript" + }); + +</script> + + +</body> +</html> Added: trunk/src/main/webapp/codemirror-ui/js/codemirror-ui-find.js =================================================================== --- trunk/src/main/webapp/codemirror-ui/js/codemirror-ui-find.js (rev 0) +++ trunk/src/main/webapp/codemirror-ui/js/codemirror-ui-find.js 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,89 @@ +/** + * @author jgreen + */ +var cursor = null; + +function setupFindReplace(){ + document.getElementById('closeButton').onclick = closeWindow; + document.getElementById('findButton').onclick = find; + document.getElementById('replaceButton').onclick = replace; + document.getElementById('replaceAllButton').onclick = replaceAll; + document.getElementById('replaceFindButton').onclick = replaceFind; +} + +function closeWindow(){ + codeMirrorUI.searchWindow = null; + window.close(); +} + +function find(){ + var findString = document.getElementById('find').value; + if (findString == null || findString == '') { + alert('You must enter something to search for.'); + return; + } + + if(document.getElementById('regex').checked){ + findString = new RegExp(findString); + } + + cursor = codeMirrorUI.mirror.getSearchCursor(findString, true); + var found = moveCursor(cursor); + + //if we didn't find anything, let's check to see if we should start from the top + if(!found && document.getElementById('wrap').checked){ + cursor = codeMirrorUI.mirror.getSearchCursor(findString, false); + found = moveCursor(cursor); + } + + if(found){ + cursor.select(); + }else{ + alert("No instances found. (Maybe you need to enable 'Wrap Search'?)"); + } + +} + +function moveCursor(cursor){ + var found = false; + if( getFindDirection() == "forward" ){ + found = cursor.findNext(); + }else{ + found = cursor.findPrevious(); + } + return found; +} + + +function getFindDirection(){ + var dRadio = document.forms[0].elements['direction']; + + for (var i = 0; i < dRadio.length; i++) { + if (dRadio[i].checked) { + return dRadio[i].value; + } + } + + return 'no-value?'; + +} + + +function replaceAll(){ + var cursor = codeMirrorUI.mirror.getSearchCursor(document.getElementById('find').value, false); + while (cursor.findNext()) + cursor.replace(document.getElementById('replace').value); +} + + +function replace(){ + cursor.replace(document.getElementById('replace').value); + //codeMirrorUI.replaceSelection(document.getElementById('replace').value); + setTimeout(window.focus, 100); + //alert('replaced!'); +} + +function replaceFind(){ + replace(); + find(); +} Added: trunk/src/main/webapp/codemirror-ui/js/codemirror-ui.js =================================================================== --- trunk/src/main/webapp/codemirror-ui/js/codemirror-ui.js (rev 0) +++ trunk/src/main/webapp/codemirror-ui/js/codemirror-ui.js 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,479 @@ +/* Demonstration of embedding CodeMirror in a bigger application. The +* interface defined here is a mess of prompts and confirms, and +* should probably not be used in a real project. +*/ +//var CodeMirrorUI = Class.create(); + +function CodeMirrorUI(place, options, mirrorOptions) { + this.initialize(place, options, mirrorOptions); +} + +CodeMirrorUI.prototype = { + + initialize: function(textarea, options, mirrorOptions) { + var defaultOptions = { + searchMode: 'popup', // other options are 'inline' and 'dialog'. The 'dialog' option needs work. + path: 'js', + buttons: ['search', 'undo', 'redo', 'jump', 'reindentSelection', 'reindent','about'] + } + this.textarea = textarea + this.options = options; + this.setDefaults(this.options, defaultOptions); + + this.buttonDefs = { + 'search': ["Search/Replace", "find_replace_popup", this.options.path + "../images/silk/find.png", this.find_replace_popup], + 'searchClose': ["Close", "find_replace_popup_close", this.options.path + "../images/silk/cancel.png", this.find_replace_popup_close], + 'searchDialog': ["Search/Replace", "find_replace_window", this.options.path + "../images/silk/find.png", this.find_replace_window], + 'undo': ["Undo", "undo", this.options.path + "../images/silk/arrow_undo.png", this.undo], + 'redo': ["Redo", "redo", this.options.path + "../images/silk/arrow_redo.png", this.redo], + 'jump': ["Jump to line #", "jump", this.options.path + "../images/silk/page_go.png", this.jump], + 'reindentSelection': ["Reformat selection", "reindentSelect", this.options.path + "../images/silk/text_indent.png", this.reindentSelection], + 'reindent': ["Reformat whole document", "reindent", this.options.path + "../images/silk/page_refresh.png", this.reindent], + 'about': ["About CodeMirror-UI", "about", this.options.path + "../images/silk/help.png", this.about] + }; + + //place = CodeMirror.replace(place) + + this.home = document.createElement("div"); + this.textarea.parentNode.insertBefore(this.home, this.textarea); + /*if (place.appendChild) + place.appendChild(this.home); + else + place(this.home); + */ + this.self = this; + + var onChange = this.editorChanged.bind(this); + // preserve custom onChance handler + if (mirrorOptions.onChange) { + mirrorOptions.onChange = function() { + mirrorOptions.onChange(); + onChange(); + } + } else { + mirrorOptions.onChange = onChange; + } + mir = CodeMirror.fromTextArea(this.textarea, mirrorOptions); + //console.log(mir); + this.mirror = mir; + + this.initButtons(); + + //this.initWordWrapControl(); // CodeMirror v2 does not support word wrapping + + if (this.options.searchMode == 'inline') { + this.initFindControl(); + } else if (this.options.searchMode == 'popup') { + this.initPopupFindControl(); + } + + if (this.undoButton) this.addClass(this.undoButton,'inactive'); + if (this.redoButton) this.addClass(this.redoButton,'inactive'); + }, + setDefaults: function(object, defaults) { + for (var option in defaults) { + if (!object.hasOwnProperty(option)) + object[option] = defaults[option]; + } + }, + toTextArea: function() { + this.home.parentNode.removeChild(this.home); + this.mirror.toTextArea(); + }, + initButtons: function() { + this.buttonFrame = document.createElement("div"); + this.buttonFrame.className = "codemirror-ui-clearfix codemirror-ui-button-frame"; + this.home.appendChild(this.buttonFrame); + for (var i = 0; i < this.options.buttons.length; i++) { + var buttonId = this.options.buttons[i]; + var buttonDef = this.buttonDefs[buttonId]; + this.addButton(buttonDef[0], buttonDef[1], buttonDef[2], buttonDef[3], this.buttonFrame); + } + + //this.makeButton("Search", "search"); + //this.makeButton("Replace", "replace"); + //this.makeButton("Current line", "line"); + //this.makeButton("Jump to line", "jump"); + //this.makeButton("Insert constructor", "macro"); + //this.makeButton("Indent all", "reindent"); + }, + /* + * This is left over from the MirrorFrame demo. + * Get rid of it quick. + */ + /* + makeButton : function(name, action){ + var button = document.createElement("input"); + button.type = "button"; + button.value = name; + this.home.appendChild(button); + button.onclick = function(){ + self[action].call(self); + }; + }, + */ + createFindBar: function() { + var findBar = document.createElement("div"); + findBar.className = "codemirror-ui-find-bar"; + + this.findString = document.createElement("input"); + this.findString.type = "text"; + this.findString.size = 8; + + this.findButton = document.createElement("input"); + this.findButton.type = "button"; + this.findButton.value = "Find"; + this.findButton.onclick = function(){this.find()}.bind(this); + + this.connect(this.findString, "keyup", function(e){ + var code = e.keyCode; + if (code == 13){ + this.find(this.mirror.getCursor(false)) + }else{ + if(!this.findString.value == ""){ + this.find(this.mirror.getCursor(true)) + } + } + this.findString.focus(); + + }.bind(this) ); + + var regLabel = document.createElement("label"); + regLabel.title = "Regular Expressions" + this.regex = document.createElement("input"); + this.regex.type = "checkbox" + this.regex.className = "codemirror-ui-checkbox" + regLabel.appendChild(this.regex); + regLabel.appendChild(document.createTextNode("RegEx")); + + var caseLabel = document.createElement("label"); + caseLabel.title = "Case Sensitive" + this.caseSensitive = document.createElement("input"); + this.caseSensitive.type = "checkbox" + this.caseSensitive.className = "codemirror-ui-checkbox" + caseLabel.appendChild(this.caseSensitive); + caseLabel.appendChild(document.createTextNode("A/a")); + + this.replaceString = document.createElement("input"); + this.replaceString.type = "text"; + this.replaceString.size = 8; + + this.connect(this.replaceString, "keyup", function(e){ + var code = e.keyCode; + if (code == 13){ + this.replace() + } + }.bind(this) ); + + this.replaceButton = document.createElement("input"); + this.replaceButton.type = "button"; + this.replaceButton.value = "Replace"; + this.replaceButton.onclick = this.replace.bind(this); + + var replaceAllLabel = document.createElement("label"); + replaceAllLabel.title = "Replace All" + this.replaceAll = document.createElement("input"); + this.replaceAll.type = "checkbox" + this.replaceAll.className = "codemirror-ui-checkbox" + replaceAllLabel.appendChild(this.replaceAll); + replaceAllLabel.appendChild(document.createTextNode("All")); + + findBar.appendChild(this.findString); + findBar.appendChild(this.findButton); + findBar.appendChild(caseLabel); + findBar.appendChild(regLabel); + + findBar.appendChild(this.replaceString); + findBar.appendChild(this.replaceButton); + findBar.appendChild(replaceAllLabel); + return findBar; + }, + initPopupFindControl: function() { + var findBar = this.createFindBar(); + + this.popupFindWrap = document.createElement("div"); + this.popupFindWrap.className = "codemirror-ui-popup-find-wrap"; + + this.popupFindWrap.appendChild(findBar); + + var buttonDef = this.buttonDefs['searchClose']; + this.addButton(buttonDef[0], buttonDef[1], buttonDef[2], buttonDef[3], this.popupFindWrap); + + this.buttonFrame.appendChild(this.popupFindWrap); + + }, + initFindControl: function() { + var findBar = this.createFindBar(); + this.buttonFrame.appendChild(findBar); + }, + find: function( start ) { + if(start == null){ + start = this.mirror.getCursor(); + } + var findString = this.findString.value; + if (findString == null || findString == '') { + alert('You must enter something to search for.'); + return; + } + if (this.regex.checked) { + findString = new RegExp(findString); + } + + this.cursor = this.mirror.getSearchCursor(findString, start, !this.caseSensitive.checked ); + var found = this.cursor.findNext(); + if (found) { + this.mirror.setSelection(this.cursor.from(),this.cursor.to()) + //this.cursor.select(); + } else { + if (confirm("No more matches. Should we start from the top?")) { + this.cursor = this.mirror.getSearchCursor(findString, 0, !this.caseSensitive.checked); + found = this.cursor.findNext(); + if (found) { + this.mirror.setSelection(this.cursor.from(),this.cursor.to()) + //this.cursor.select(); + } else { + alert("No matches found."); + } + } + } + }, + replace: function() { + if (this.replaceAll.checked) { + var cursor = this.mirror.getSearchCursor(this.findString.value, this.mirror.getCursor(), !this.caseSensitive.checked); + while (cursor.findNext()) + this.mirror.replaceRange(this.replaceString.value,cursor.from(),cursor.to()) + //cursor.replace(this.replaceString.value); + } else { + this.mirror.replaceRange(this.replaceString.value,this.cursor.from(),this.cursor.to()) + //this.cursor.replace(this.replaceString.value); + this.find(); + } + }, + initWordWrapControl: function() { + var wrapDiv = document.createElement("div"); + wrapDiv.className = "codemirror-ui-wrap" + + var label = document.createElement("label"); + + this.wordWrap = document.createElement("input"); + this.wordWrap.type = "checkbox" + this.wordWrap.checked = true; + label.appendChild(this.wordWrap); + label.appendChild(document.createTextNode("Word Wrap")); + this.wordWrap.onchange = this.toggleWordWrap.bind(this); + wrapDiv.appendChild(label); + this.buttonFrame.appendChild(wrapDiv); + }, + toggleWordWrap: function() { + if (this.wordWrap.checked) { + this.mirror.setTextWrapping("nowrap"); + } else { + this.mirror.setTextWrapping(""); + } + }, + addButton: function(name, action, image, func, frame) { + var button = document.createElement("a"); + //button.href = "#"; + button.className = "codemirror-ui-button " + action; + button.title = name; + button.func = func.bind(this); + button.onclick = function(event) { + //alert(event.target); + event.target.func(); + return false; + //this.self[action].call(this); + //eval("this."+action)(); + } + .bind(this, func); + var img = document.createElement("img"); + img.src = image; + img.border = 0; + img.func = func.bind(this); + button.appendChild(img); + frame.appendChild(button); + if (action == 'undo') { + this.undoButton = button; + } + if (action == 'redo') { + this.redoButton = button; + } + }, + classNameRegex: function(className) { + var regex = new RegExp("(.*) *" + className + " *(.*)"); + return regex; + }, + addClass: function(element, className) { + if (!element.className.match(this.classNameRegex(className))) { + element.className += " " + className; + } + }, + removeClass: function(element, className) { + var m = element.className.match(this.classNameRegex(className)) + if (m) { + element.className = m[1] + " " + m[2]; + } + }, + editorChanged: function() { + if(!this.mirror) { + return + } + var his = this.mirror.historySize(); + if (his['undo'] > 0) { + this.removeClass(this.undoButton, 'inactive'); + } else { + this.addClass(this.undoButton, 'inactive'); + } + if (his['redo'] > 0) { + this.removeClass(this.redoButton, 'inactive'); + } else { + this.addClass(this.redoButton, 'inactive'); + } + //alert("undo size = " + his['undo'] + " and redo size = " + his['redo']); + }, + undo: function() { + this.mirror.undo(); + }, + redo: function() { + this.mirror.redo(); + }, + replaceSelection: function(newVal) { + this.mirror.replaceSelection(newVal); + this.searchWindow.focus(); + }, + raise_search_window: function() { + //alert('raising window!'); + this.searchWindow.focus(); + }, + find_replace_window: function() { + if (this.searchWindow == null) { + this.searchWindow = window.open(this.options.path + "find_replace.html", "mywindow", "scrollbars=1,width=400,height=350,modal=yes"); + this.searchWindow.codeMirrorUI = this; + } + this.searchWindow.focus(); + }, + find_replace_popup: function() { + //alert('Hello!'); + this.popupFindWrap.className = "codemirror-ui-popup-find-wrap active"; + this.findString.focus(); + }, + find_replace_popup_close: function() { + //alert('Hello!'); + this.popupFindWrap.className = "codemirror-ui-popup-find-wrap"; + }, + /* + find_replace: function(){ + this.find_replace = document.createElement("div"); + this.find_replace.className = "codemirror-search-replace"; + this.find_replace.innerHTML = "Just a test!"; + this.home.appendChild(this.find_replace); + }, + + search: function(){ + var text = prompt("Enter search term:", ""); + if (!text) + return; + + var first = true; + do { + var cursor = this.mirror.getSearchCursor(text, first); + first = false; + while (cursor.findNext()) { + cursor.select(); + if (!confirm("Search again?")) + return; + } + } + while (confirm("End of document reached. Start over?")); + }, + + replace: function(){ + // This is a replace-all, but it is possible to implement a + // prompting replace. + var from = prompt("Enter search string:", ""), to; + if (from) + to = prompt("What should it be replaced with?", ""); + if (to == null) + return; + + var cursor = this.mirror.getSearchCursor(from, false); + while (cursor.findNext()) + cursor.replace(to); + }, + */ + jump: function() { + var line = prompt("Jump to line:", ""); + if (line && !isNaN(Number(line))) { + this.mirror.setCursor(Number(line),0); + this.mirror.setSelection({line:Number(line),ch:0},{line:Number(line)+1,ch:0}); + this.mirror.focus(); + } + }, + /* + line: function(){ + alert("The cursor is currently at line " + this.mirror.currentLine()); + this.mirror.focus(); + }, + + macro: function(){ + var name = prompt("Name your constructor:", ""); + if (name) + this.mirror.replaceSelection("function " + name + "() {\n \n}\n\n" + name + ".prototype = {\n \n};\n"); + }, + */ + reindent: function() { + var lineCount = this.mirror.lineCount(); + for(var line = 0; line < lineCount; line++) { + this.mirror.indentLine(line); + } + }, + about : function() { + string = "CodeMirror-UI was written by Jeremy Green (http://www.octolabs.com/) as a light interface around CodeMirror by Marijn Haverbeke (http://codemirror.net)" + string += "\n\n" + string += "Documentation and the code can be found at https://github.com/jagthedrummer/codemirror-ui/." + alert(string); + }, + reindentSelection: function() { + var cur = this.mirror.getCursor() + //console.log(cur) + var start = this.mirror.getCursor(true)["line"] + var end = this.mirror.getCursor(false)["line"] + for(var line = start; line <= end; line++) { + this.mirror.indentLine(line); + } + //this.mirror.reindentSelection(); + + }, + // Event handler registration. If disconnect is true, it'll return a + // function that unregisters the handler. + // Borrowed from CodeMirror + modified + connect: function (node, type, handler, disconnect) { + /*function wrapHandler(event) { + handler(new Event(event || window.event)); + }*/ + + if (typeof node.addEventListener == "function") { + node.addEventListener(type, handler, false); + if (disconnect) + return function() { + node.removeEventListener(type, handler, false); + }; + } else { + node.attachEvent("on" + type, handler); + if (disconnect) + return function() { + node.detachEvent("on" + type, handler); + }; + } + } +}; + +/* + * This makes coding callbacks much more sane + */ +Function.prototype.bind = function(scope) { + var _function = this; + + return function() { + return _function.apply(scope, arguments); + } +} Added: trunk/src/main/webapp/codemirror-ui/js/find_replace.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/js/find_replace.html (rev 0) +++ trunk/src/main/webapp/codemirror-ui/js/find_replace.html 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,68 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> +<html> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> + <title>CodeMirror UI Find/Replace</title> + <link rel="stylesheet" href="../css/codemirror-ui-find.css" type="text/css" media="screen" /> + <script src="codemirror-ui-find.js" type="text/javascript"></script> + </head> + <body> + <h3>Find/Replace</h3> + <form name="findReplaceForm"> + <table> + <tr> + <td>Find</td> + <td><input id="find" type="text" value=""/></td> + </tr> + <tr> + <td>Replace</td> + <td><input id="replace" type="text" value=""/></td> + </tr> + <tr> + <td colspan="2"> + <label> + <input type="radio" name="direction" value="forward" checked="checked"/>Forward + </label> + <label> + <input type="radio" name="direction" value="backward"/>Backward + </label> + <br/> + <label> + <input type="checkbox" id="wrap" value="true"/>Wrap Search + </label> + <br/> + <label> + <input type="checkbox" id="regex" value="true"/>Regex + </label> + </td> + </tr> + </table> + </form> + <table id="buttons"> + <tr> + <td> + <a href="#" id="findButton">Find</a> + </td> + <td> + <a href="#" id="replaceFindButton">Replace/Find</a> + </td> + </tr> + <tr> + <td> + <a href="#" id="replaceButton">Replace</a> + </td> + <td> + <a href="#" id="replaceAllButton">Replace All</a> + </td> + </tr> + <tr> + <td colspan="2"> + <a href="#" id="closeButton">Close</a> + </td> + </tr> + </table> + <script type="text/javascript"> + setupFindReplace(); + </script> + </body> +</html> Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/LICENSE =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/LICENSE (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/LICENSE 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,19 @@ +Copyright (C) 2011 by Marijn Haverbeke <marijnh(a)gmail.com> + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/README.md =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/README.md (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/README.md 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,6 @@ +# CodeMirror 2 + +CodeMirror 2 is a rewrite of [CodeMirror +1](http://github.com/marijnh/CodeMirror). The docs live +[here](http://codemirror.net/2/manual.html), and the project page is +[http://codemirror.net/2/](http://codemirror.net/2/). Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/compress.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/compress.html (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/compress.html 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,77 @@ +<!doctype html> +<html> + <head> + <title>CodeMirror: Compression Helper</title> + <link rel="stylesheet" type="text/css" href="css/docs.css"/> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> + </head> + <body> + +<h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMirror</a></h1> + +<pre class="grey"> +<img src="css/baboon.png" class="logo" alt="logo"/>/* Script compression + helper */ +</pre> + + <p>To optimize loading CodeMirror, especially when including a + bunch of different modes, it is recommended that you combine and + minify (and preferably also gzip) the scrips. This page makes + those first two steps very easy. Simply select the version and + scripts you need in the form below, and + click <strong>Compress</strong> to download the minified script + file.</p> + + <form id="form" action="http://marijnhaverbeke.nl/uglifyjs" method="post"> + <input type="hidden" id="download" name="download" value="codemirror-compressed.js"/> + <p>Version: <select id="version" onchange="setVersion(this);" style="padding: 1px"> + <option value="http://codemirror.net/2/">HEAD</option> + <option value="http://marijnhaverbeke.nl/git/codemirror2?a=blob_plain;hb=v2.0;f=">2.0</option> + <option value="http://marijnhaverbeke.nl/git/codemirror2?a=blob_plain;hb=beta2;f=">beta2</option> + <option value="http://marijnhaverbeke.nl/git/codemirror2?a=blob_plain;hb=beta1;f=">beta1</option> + </select></p> + + <select multiple="multiple" name="code_url" style="width: 40em;" class="field" id="files"> + <optgroup label="CodeMirror Library"> + <option value="http://codemirror.net/2/lib/codemirror.js" selected>codemirror.js</option> + <option value="http://codemirror.net/2/lib/overlay.js">overlay.js</option> + </optgroup> + <optgroup label="Modes"> + <option value="http://codemirror.net/2/mode/javascript/javascript.js">javascript.js</option> + <option value="http://codemirror.net/2/mode/xml/xml.js">xml.js</option> + <option value="http://codemirror.net/2/mode/css/css.js">css.js</option> + <option value="http://codemirror.net/2/mode/htmlmixed/htmlmixed.js">htmlmixed.js</option> + <option value="http://codemirror.net/2/mode/clike/clike.js">clike.js</option> + <option value="http://codemirror.net/2/mode/php/php.js">php.js</option> + <option value="http://codemirror.net/2/mode/haskell/haskell.js">haskell.js</option> + <option value="http://codemirror.net/2/mode/diff/diff.js">diff.js</option> + <option value="http://codemirror.net/2/mode/stex/stex.js">stex.js</option> + </optgroup> + </select></p> + + <p> + <button type="submit">Compress</button> with <a href="http://github.com/mishoo/UglifyJS/">UglifyJS</a> + </p> + + <p>Custom code to add to the compressed file:<textarea name="js_code" style="width: 100%; height: 15em;" class="field"></textarea></p> + </form> + + <script type="text/javascript"> + function setVersion(ver) { + var urlprefix = ver.options[ver.selectedIndex].value; + var select = document.getElementById("files"), m; + for (var optgr = select.firstChild; optgr; optgr = optgr.nextSibling) + for (var opt = optgr.firstChild; opt; opt = opt.nextSibling) { + if (opt.nodeName != "OPTION") + continue; + else if (m = opt.value.match(/^http:\/\/codemirror.net\/2\/(.*)$/)) + opt.value = urlprefix + m[1]; + else if (m = opt.value.match(/http:\/\/marijnhaverbeke.nl\/git\/codemirror\?a=blob_plain;hb=[^;]+;f=(.*)$/)) + opt.value = urlprefix + m[1]; + } + } + </script> + <script type="text/javascript" src="css/font.js"></script> + + </body> +</html> Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/css/baboon.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/css/baboon.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/css/baboon_vector.svg =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/css/baboon_vector.svg (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/css/baboon_vector.svg 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,153 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> + + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + id="svg3181" + version="1.1" + inkscape:version="0.48.0 r9654" + width="1750" + height="960" + xml:space="preserve" + sodipodi:docname="baboon_vector.svg"><metadata + id="metadata3187"><rdf:RDF><cc:Work + rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs + id="defs3185"><clipPath + clipPathUnits="userSpaceOnUse" + id="clipPath3195"><path + d="M 0,768 1400,768 1400,0 0,0 0,768 z" + id="path3197" /></clipPath><clipPath + clipPathUnits="userSpaceOnUse" + id="clipPath3215"><path + d="M 0,768 1400,768 1400,0 0,0 0,768 z" + id="path3217" /></clipPath></defs><sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1440" + inkscape:window-height="851" + id="namedview3183" + showgrid="false" + inkscape:zoom="0.20550291" + inkscape:cx="1534.1667" + inkscape:cy="795.78156" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1" + inkscape:current-layer="g3189" /><g + id="g3189" + inkscape:groupmode="layer" + inkscape:label="baboon_vector" + transform="matrix(1.25,0,0,-1.25,0,960)"><g + id="g3191"><g + id="g3193" + clip-path="url(#clipPath3195)"><g + id="g3199" + transform="translate(458.9561,569.9678)"><path + d="m 0,0 59.835,69.355 87.034,26.518 133.949,-7.479 c 0,0 74.116,-32.639 74.795,-34.678 0.68,-2.04 84.314,-59.155 84.314,-59.155 l 12.238,-74.795 5.439,-97.912 -13.598,-25.159 -4.76,-40.797 -18.358,-23.118 24.39,-5.561 0.501,-5.192 -14.012,-60.641 16.477,-93.368 7.223,-49.972 -208.295,-51.754 -18.552,4.005 -37.468,8.325 -10.036,4.036 -66.885,10.101 c 0,0 -14.959,74.793 -16.999,73.433 -2.039,-1.359 -42.836,56.437 -42.836,56.437 l -19.719,65.274 12.48,74.571 -7.961,9.643 -26.479,16.187 -12.716,38.309 4.08,48.277 8.769,38.985 L 6.608,-74.308 0,0 z" + style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" + id="path3201" /></g><g + id="g3203" + transform="translate(78.8657,682.1582)"><path + d="M 0,0 142.789,40.797 259.74,52.355 313.457,-232.543 204.665,-291.698 78.194,-293.738 0,0 z" + style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" + id="path3205" /></g><g + id="g3207" + transform="translate(269.5122,345.2344)"><path + d="M 0,0 18.801,-74.425 40.728,-85.408 59.539,-59.541 40.259,13.503 36.821,15.669 0,0 z" + style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" + id="path3209" /></g></g></g><g + id="g3223" + transform="translate(741.918,109.0332)"><path + d="m 0,0 -17.236,-9.401 -16.452,-22.721 -0.783,12.537 6.268,17.234 13.317,6.268 L 0,7.833 14.884,3.917 0,0 z m 172.622,-21.824 c -0.031,0.271 -0.081,0.535 -0.117,0.804 -20.85,7.653 -49.59,7.327 -66.874,10.927 -13.849,2.886 -23.047,9.119 -27.032,12.298 -9.863,-8.494 -12.025,-14.377 -12.025,-14.377 0,0 -9.816,15.309 -30.17,25.76 -7.05,3.621 -17.767,5.691 -29.341,5.691 -24.297,0 -52.384,-9.155 -58.339,-32.223 -10.458,-40.511 9.697,-76.594 49.814,-77.623 1.325,-0.034 2.623,-0.12 3.894,-0.12 36.131,0 48.855,8.572 58.323,15.478 0.027,0.021 0.104,0 0.104,0 0,0 25.126,-11.506 53.529,-11.506 4.419,0 9.156,0.415 14.249,1.063 31.641,4.018 47.989,28.124 43.985,63.828" + style="fill:#df0019;fill-opacity:1;fill-rule:nonzero;stroke:none" + id="path3225" + inkscape:connector-curvature="0" /></g><g + id="g3227" + transform="translate(300.8481,270.0254)"><path + d="m 0,0 c -3.063,-0.691 -12.535,0.784 -12.535,0.784 l 6.267,-25.853 43.481,13.319 -9.01,27.418 C 28.203,15.668 7.867,1.777 0,0" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" + id="path3229" + inkscape:connector-curvature="0" /></g><g + id="g3231" + transform="translate(211.66052,615.85984)"><path + d="m 0,0 -16.243,-2.871 -15.462,-9.4 4.323,-10.938 14.568,9.89 L 2.75,-8.771 0,0 z" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" + id="path3233" + inkscape:connector-curvature="0" /></g><g + id="g3235" + transform="translate(274.15732,626.4084)"><path + d="m 0,0 -15.64,0.407 -14.279,-3.608 2.008,-9.747 14.756,4.208 L 1.111,-8.215 0,0 z" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" + id="path3237" + inkscape:connector-curvature="0" /></g><path + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" + d="M 436.65625 22.28125 C 436.65625 22.28125 338.18375 25.385 251 42.8125 C 163.24875 60.35375 70.40625 99.65625 70.40625 99.65625 L 175.1875 495.28125 L 327.96875 492.34375 L 337.75 527.59375 C 337.75 527.59375 365.095 523.25875 373 518.78125 C 376.31375 516.90375 383.78125 508 383.78125 508 L 377.75 484.65625 L 504.21875 407.15625 L 436.65625 22.28125 z M 410.53125 55.1875 L 465.6875 393.3125 L 346.59375 456.625 L 202.75 466.46875 L 112 114.40625 L 263 79.1875 L 410.53125 55.1875 z " + transform="matrix(0.8,0,0,-0.8,0,768)" + id="path3253" /><g + id="g3247" + transform="matrix(1.199238,-0.02879331,0.02673084,1.0520756,172.41935,498.37339)"><path + d="m 0,0 c 0,0 -1.861,1.481 -9.143,-1.457 9.712,18.867 9.439,39.989 9.439,39.989 0,0 -3.106,-2.465 -11.311,-8.47 9.241,23.044 5.338,72.525 5.338,72.525 0,0 -17.493,40.746 -13.657,45.799 8.841,11.65 23.834,23.968 44.295,25.594 17.935,1.424 44.606,-4.953 55.865,-15.284 4.536,-4.161 23.367,-47.493 23.367,-47.493 0,0 6.104,-35.271 11.619,-54.108 5.513,-18.839 11.054,-26.674 21.284,-34.825 17.831,-14.207 27.076,-29.938 27.076,-29.938 L 143.399,3.945 c 3.655,-17.356 14.875,-34.28 27.39,-47.672 -12.863,1.507 -19.61,8.783 -19.61,8.783 0,0 2.151,-12.664 9.109,-26.554 l 28.712,15.264 -1.762,10.805 c -5.128,9.304 -9.336,15.534 -9.336,15.534 0,0 2.089,0.956 7.385,-3.572 l -2.005,12.296 c -4.814,9.391 -11.773,16.752 -25.115,31.113 5.944,-6.087 15.438,-5.379 20.751,-4.356 l -0.572,3.512 c -2.231,1.278 -5.494,3.171 -10.241,5.957 -12.43,7.299 -22.326,21.049 -22.326,21.049 0,0 12.85,1.815 20.513,11.022 -7.316,-2.641 -18.585,0.799 -18.585,0.799 -17.086,6.772 -15.022,30.217 -17.687,50.587 -2.667,20.37 -9.299,34.125 -9.299,34.125 0,0 -0.243,2.149 11.91,-5.906 -7.744,33.215 -35.545,44.94 -35.545,44.94 0,0 2.223,2.79 22.843,0.044 -16.469,15.817 -32.303,16.896 -32.303,16.896 0,0 10.077,2.25 23.611,0.24 0,0 -3.327,3.508 -7.549,6.453 L 35.985,194.291 -77.543,167.815 -8.211,-101.17 17.481,-99.413 C 8.602,-85.114 -0.371,-63.837 -2.15,-40.857 -4.911,-5.208 0,0 0,0" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" + id="path3249" + inkscape:connector-curvature="0" /></g><g + id="g3255" + transform="translate(204.22134,580.88353)"><path + d="m 0,0 c 0,-1.418 0.43,-2.736 1.168,-3.83 1.523,0.677 3.551,1.094 5.786,1.094 2.164,0 4.133,-0.39 5.639,-1.029 0.711,1.081 1.129,2.374 1.129,3.765 0,3.79 -3.072,6.861 -6.861,6.861 C 3.071,6.861 0,3.79 0,0" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" + id="path3257" + inkscape:connector-curvature="0" /></g><g + id="g3259" + transform="translate(256.3311,595.31646)"><path + d="m 0,0 c 0,-1.418 0.43,-2.736 1.168,-3.83 1.524,0.677 3.552,1.094 5.787,1.094 2.163,0 4.132,-0.39 5.638,-1.029 0.712,1.081 1.129,2.373 1.129,3.765 0,3.79 -3.072,6.861 -6.861,6.861 C 3.071,6.861 0,3.79 0,0" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" + id="path3261" + inkscape:connector-curvature="0" /></g><g + id="g4174" + transform="matrix(0.99694509,0.07810563,-0.07810563,0.99694509,47.348748,-15.348299)"><g + transform="translate(222.5098,610.1558)" + id="g3219"><path + inkscape:connector-curvature="0" + id="path3221" + style="fill:#df0019;fill-opacity:1;fill-rule:nonzero;stroke:none" + d="m 0,0 4.45,2.752 5.34,3.785 7.05,-8.226 7.093,-33.359 17.801,-51.259 13.86,-30.215 26.261,-1.55 -6.685,-35.653 c 0,0 -49.98,-21.871 -49.545,-21.911 -42.657,4.001 -12.553,43.066 -8.631,47.301 L 3.666,-47.869 0,0 z" /></g><g + transform="translate(247.626,467.3545)" + id="g3239"><path + inkscape:connector-curvature="0" + id="path3241" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" + d="M 0,0 C -3.044,-0.345 -5.232,-3.092 -4.888,-6.136 -4.543,-9.18 1.576,-2.254 13.308,-4.961 13.971,-1.97 3.044,0.344 0,0" /></g><g + transform="translate(279.4419,476.5762)" + id="g3243"><path + inkscape:connector-curvature="0" + id="path3245" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" + d="M 0,0 C 3.271,1.08 6.798,-0.697 7.88,-3.969 8.96,-7.24 -0.55,-3.044 -11.258,-11.329 -13.345,-8.586 -3.272,-1.081 0,0" /></g><g + transform="translate(284.1929,525.9082)" + id="g3263"><path + inkscape:connector-curvature="0" + id="path3265" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" + d="M 0,0 C 0,0 -6.972,28.671 -6.972,29.355 L 1.585,2.864 9.999,-10.564 13.634,-32.697 7.922,-11.098 0,0 z M -0.633,-15.036 -9.19,-4.86 -16.478,25.776 c -0.202,0.684 9.106,-28.811 9.106,-28.811 l 8.64,-11.642 2.469,-17.336 -4.37,16.977 z m -6.339,-6.085 -10.457,16.826 -5.444,28.646 6.614,-27.842 11.311,-18.026 1.413,-9.583 -3.437,9.979 z m -53.462,-13.246 -1.437,24.944 -2.682,28.754 5.106,-29.895 1.212,-21.677 4.139,-18.236 -6.338,16.11 z m -4.265,-19.55 -6.665,15.516 0.404,29.205 -0.882,28.169 3.104,-28.396 0.808,-26.697 4.242,-15.972 2.423,-6.617 -3.434,4.792 z m -9.695,-2.967 -7.117,16.885 1.318,32.01 0,25.223 2.115,-25.061 -0.581,-31.259 5.869,-16.429 5.056,-8.671 -6.66,7.302 z m 103.144,-7.97 -6.676,20.38 2.141,11.54 L 16.499,-9.376 4.557,13.104 -5.879,53.97 c 0,0 -8.325,-7.41 -16.781,-8.08 -8.455,-0.671 -15.09,4.018 -15.09,4.018 0,0 3.592,-17.761 8.659,-37.597 5.069,-19.836 17.528,-44.866 17.528,-44.866 0,0 21.578,-8.197 24.302,-16.587 2.724,-8.391 -3.508,-22.911 -14.102,-26.551 -10.593,-3.64 -32.284,-8.262 -32.284,-8.262 0,0 -19,1.512 -20.438,14.26 0,0 4.131,16.406 10.418,19.225 6.285,2.819 21.362,11.174 21.362,11.174 l -8.254,1.332 -7.664,-1.332 c 0,0 -4.784,11.295 -10.973,35.086 -6.19,23.79 -8.967,42.485 -8.967,42.485 0,0 -3.912,-4.391 -14.199,-4.885 -10.286,-0.494 -16.031,7.988 -16.031,7.988 l 1.027,-30.185 -1.049,-25.83 -0.15,-29.22 5.102,-15.99 19.818,-30.448 c 0,0 14.102,-9.293 31.728,-9.293 16.453,1.328 51.131,18.047 51.131,18.047 l 9.536,16.687 z" /></g></g><g + id="g3267" + transform="translate(847.2637,321.5059)"><path + d="m 0,0 c 2.252,3.516 6.693,15.3 6.693,15.3 0,0 3.778,-13.306 1.912,-17.213 -3.056,-6.404 -23.905,-15.3 -23.905,-15.3 0,0 12.196,12.364 15.3,17.213 m -33.514,23.16 -0.757,56.352 c 0,0 11.136,-14.028 11.843,-19.739 1.176,-9.491 -11.086,-36.613 -11.086,-36.613 m -17.575,236.921 c 0,0 12.453,-15.338 14.854,-21.39 1.424,-3.591 2.286,-15.287 2.286,-15.287 l -17.14,36.677 z M -98.574,-86.136 c -9.757,-0.906 -29.836,1.016 -38.912,4.708 -7.499,3.05 -25.734,19.656 -25.734,19.656 l 24.187,-10.86 -4.701,17.627 15.272,-22.009 41.813,-5.356 c 0,0 -8.812,-3.477 -11.925,-3.766 m -74.428,157.941 c -4.518,10.057 -1.763,44.065 -1.763,44.065 0,0 7.544,-31.093 12.338,-40.541 6.978,-13.754 37.015,-49.352 37.015,-49.352 0,0 -40.824,30.759 -47.59,45.828 m -17.833,-149.47 -40.407,24.724 1.636,-17.575 0.026,-0.035 -5.178,-29.811 -2.056,-10.701 0.383,-33.34 -4.982,36.406 6.41,41.45 -11.063,8.338 -17.532,43.159 23.502,-38.779 2.351,14.101 40.634,-25.695 11.924,-5.651 13.809,-28.871 -19.457,22.28 z m -85.522,138.863 17.212,-34.424 c 0,0 -12.972,11.185 -15.299,16.257 -1.905,4.152 -1.913,18.167 -1.913,18.167 m -2.367,66.042 c 0,0 -6.206,15.581 -6.323,21.082 -0.168,7.817 4.568,23.148 7.695,30.315 0.755,1.73 4.103,6.341 4.103,6.341 0,0 -4.654,-24.542 -5.347,-32.829 -0.518,-6.205 -0.128,-24.909 -0.128,-24.909 m -7.195,-114.809 c -0.334,3.363 1.912,13.387 1.912,13.387 l 3.825,-29.643 c 0,0 -5.313,11.967 -5.737,16.256 m -20.082,53.549 c -1.394,3.571 -0.956,15.301 -0.956,15.301 l 13.388,-30.6 c 0,0 -10.639,10.71 -12.432,15.299 m -6.03,106.795 c 0,0 -0.315,35.831 4.637,46.379 4.531,9.647 29.936,30.356 29.936,30.356 0,0 -17.824,-22.47 -21.503,-31.2 -5.089,-12.077 -10.119,-51.437 -10.119,-51.437 l -2.951,5.902 z M 50.121,205.01 c 3.335,-9.155 1.168,-38.956 1.168,-38.956 0,0 -5.451,29.987 -9.221,39.366 -4.214,10.487 -23.014,38.907 -23.014,38.907 0,0 26.78,-27.546 31.067,-39.317 M 54.506,95.624 c 0,0 6.884,-18.586 5.738,-24.861 -0.773,-4.241 -9.562,-14.345 -9.562,-14.345 0,0 2.414,12.874 2.868,17.212 0.573,5.474 0.956,21.994 0.956,21.994 M 19.125,-13.389 c 0,0 9.656,22.183 11.062,30.068 1.235,6.941 0,28.203 0,28.203 0,0 8.477,-22.819 7.106,-30.538 C 35.845,6.183 19.125,-13.389 19.125,-13.389 m 441.487,-40.965 c -3.249,8.935 -6.587,17.23 -10.01,24.928 l -1.862,28.873 -8.857,-4.876 -25.862,49.457 -4.828,-10.34 c -32.69,31.48 -70.457,34.284 -111.982,31.646 -65.568,-4.163 -91.587,-41.63 -79.098,-57.241 12.49,-15.613 18.733,-5.205 40.589,5.203 21.858,10.407 74.937,26.017 110.323,-2.082 35.386,-28.1 86.383,-109.281 50.997,-169.646 -35.386,-60.365 -105.626,-105.385 -182.135,-88.465 -86.422,19.112 -126.078,60.082 -177.675,74.811 -8.311,1.334 -18.347,2.789 -24.791,3.191 -12.671,0.792 -21.6,14.727 -21.6,14.727 l 17.181,-9.327 25.763,-2.36 c 2.331,14 9.395,49.054 9.395,49.054 l -8.688,87.29 -18.668,-27.06 -7.246,10.184 -21.349,-22.915 -15.473,-1.959 14.67,6.596 21.38,29.409 6.7,-13.754 19.485,24.691 0.004,-0.011 16.47,9.525 -3.123,68.69 10.407,-10.407 -4.163,40.59 22.173,71.502 -34.662,91.899 16.652,-4.162 -19.773,35.386 -40.591,38.509 9.368,17.693 -93.671,9.368 -20.229,-7.165 -18.437,38.292 13.22,8.813 -69.039,14.69 2.938,19.095 -80.791,-23.303 -26.147,-19.191 -116.339,0 8.814,-10.188 -42.501,-40.641 -8.911,-78.491 7.344,-1.494 8.814,-45.548 23.502,-24.978 19.096,45.533 -14.689,-4.409 41.13,48.474 30.848,26.44 -14.69,-1.469 19.096,16.158 105.763,2.938 72.917,15.799 -41.623,-14.742 -30.181,-7.285 -104.079,-1.043 1.04,-11.449 -64.526,-61.403 14.571,2.081 -27.844,-63.28 c -15.017,-13.719 -28.06,-55.016 -36.687,-75.145 -9.367,-21.856 -20.816,-39.55 -20.816,-39.55 0,0 -30.182,-6.244 -61.405,-18.734 -31.224,-12.489 -43.713,4.163 -43.713,4.163 l -3.122,-8.326 c 0,0 -18.28,-9.057 -39.303,-11.825 -16.43,-2.162 -9.967,-20.946 -9.613,-26.684 0.405,-6.57 4.294,-19.774 8.325,-24.978 3.227,-4.165 12.525,-10.425 17.694,-11.448 12.039,-2.385 28.101,5.204 45.794,17.693 74.936,-6.245 103.241,-10.321 126.974,8.326 14.572,11.448 29.142,22.897 41.631,40.59 l -15.611,42.671 -8.327,-14.569 -5.807,44.931 1.841,17.863 5.547,-51.234 7.789,9.257 35.387,-70.772 11.448,4.164 c 0,0 13.515,-18.583 23.057,-32.881 l -26.02,25.006 -10.224,-5.964 -11.076,22.152 c 0,0 -13.383,-2.353 -24.727,-18.027 -15.862,-21.915 -23.503,-24.678 -17.627,-78.735 5.876,-54.055 16.452,-54.055 64.632,-121.039 11.752,-16.452 14.601,-18.465 14.601,-18.465 l -51.03,-27.365 -22.327,-5.876 -21.384,-11.28 c 0,0 4.744,-8.174 7.495,-9.369 4.739,-2.062 20.613,1.56 20.613,1.56 0,0 15.603,-6.763 36.756,-6.763 21.152,0 32.903,8.225 47.005,8.225 14.101,0 38.78,-8.225 57.582,-5.876 18.802,2.351 22.328,12.927 22.328,12.927 l -51.706,54.057 -4.675,47.096 -56.605,75.769 -3.038,9.437 65.791,-82.24 5.107,-46.75 55.161,-61.405 37.468,-8.325 c 0,0 -0.257,1.226 -0.625,3.114 -6.146,15.664 -6.986,34.894 -1.999,54.214 6.975,27.012 38.85,36.596 64.029,36.596 12.506,0 24.179,-2.312 32.025,-6.341 12.912,-6.63 21.851,-15.076 27.029,-20.917 3.673,4.516 7.133,7.194 11.833,11.11 0,0 12.143,-11.751 45.047,-14.101 27.14,-1.939 45.048,-8.226 70.901,-19.585 53.676,-23.584 102.5,-61.785 207.618,-45.132 105.119,16.651 206.073,113.444 164.442,227.929" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" + id="path3269" + inkscape:connector-curvature="0" /></g><path + inkscape:connector-curvature="0" + style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" + d="m 329.26398,723.3082 -118.025,-19.2 -120.800003,-28.175 72.600003,-281.65 115.075,7.875 95.275,50.65 -44.125,270.5 z m -6.55,-10.575 40.675,-252.4 -87.85,-47.275 -106.125,-7.325 -66.95,262.8 111.4,26.275 108.85,17.925 z" + id="path3253-3" /></g></svg> \ No newline at end of file Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/css/docs.css =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/css/docs.css (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/css/docs.css 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,158 @@ +body { + font-family: Arial, sans-serif; + line-height: 1.5; + max-width: 64.3em; + margin: 3em auto; + padding: 0 1em; +} +body.droid { + font-family: Droid Sans, Arial, sans-serif; +} + +h1 { + letter-spacing: -3px; + font-size: 3.23em; + font-weight: bold; + margin: 0; +} + +h2 { + font-size: 1.23em; + font-weight: bold; + margin: .5em 0; + letter-spacing: -1px; +} + +h3 { + font-size: 1em; + font-weight: bold; + margin: .4em 0; +} + +pre { + font-family: Courier New, monospaced; + background-color: #eee; + -moz-border-radius: 6px; + -webkit-border-radius: 6px; + border-radius: 6px; + padding: 1em; +} + +pre.code { + margin: 0 1em; +} + +.grey { + font-size: 2em; + padding: .5em 1em; + line-height: 1.2em; + margin-top: .5em; + position: relative; +} + +img.logo { + position: absolute; + right: -25px; + bottom: 4px; +} + +a:link, a:visited, .quasilink { + color: #df0019; + cursor: pointer; + text-decoration: none; +} + +a:hover, .quasilink:hover { + color: #800004; +} + +h1 a:link, h1 a:visited, h1 a:hover { + color: black; +} + +ul { + margin: 0; + padding-left: 1.2em; +} + +a.download { + color: white; + background-color: #df0019; + width: 100%; + display: block; + text-align: center; + font-size: 1.23em; + font-weight: bold; + text-decoration: none; + -moz-border-radius: 6px; + -webkit-border-radius: 6px; + border-radius: 6px; + padding: .5em 0; + margin-bottom: 1em; +} + +a.download:hover { + background-color: #bb0010; +} + +.rel { + margin-bottom: 0; +} + +.rel-note { + color: #777; + font-size: .9em; + margin-top: .1em; +} + +.logo-braces { + color: #df0019; + position: relative; + top: -4px; +} + +.blk { + float: left; +} + +.left { + width: 37em; + padding-right: 6.53em; + padding-bottom: 1em; +} + +.left1 { + width: 15.24em; + padding-right: 6.45em; +} + +.left2 { + width: 15.24em; +} + +.right { + width: 20.68em; +} + +.leftbig { + width: 42.44em; + padding-right: 6.53em; +} + +.rightsmall { + width: 15.24em; +} + +.clear:after { + visibility: hidden; + display: block; + font-size: 0; + content: " "; + clear: both; + height: 0; +} +.clear { display: inline-block; } +/* start commented backslash hack \*/ +* html .clear { height: 1%; } +.clear { display: block; } +/* close commented backslash hack */ Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/css/font.js =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/css/font.js (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/css/font.js 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,15 @@ +function waitForStyles() { + for (var i = 0; i < document.styleSheets.length; i++) + if (/googleapis/.test(document.styleSheets[i].href)) + return document.body.className += " droid"; + setTimeout(waitForStyles, 100); +} +setTimeout(function() { + if (/AppleWebKit/.test(navigator.userAgent) && /iP[oa]d|iPhone/.test(navigator.userAgent)) return; + var link = document.createElement("LINK"); + link.type = "text/css"; + link.rel = "stylesheet"; + link.href = "http://fonts.googleapis.com/css?family=Droid+Sans|Droid+Sans:bold"; + document.documentElement.getElementsByTagName("HEAD")[0].appendChild(link); + waitForStyles(); +}, 10); Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/demo/activeline.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/demo/activeline.html (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/demo/activeline.html 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,71 @@ +<!doctype html> +<html> + <head> + <title>CodeMirror 2: Active Line Demo</title> + <link rel="stylesheet" href="../lib/codemirror.css"> + <script src="../lib/codemirror.js"></script> + <link rel="stylesheet" href="../mode/xml/xml.css"> + <script src="../mode/xml/xml.js"></script> + <link rel="stylesheet" href="../css/docs.css"> + + <style type="text/css"> + .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;} + .activeline {background: #f0fcff !important;} + </style> + </head> + <body> + <h1>CodeMirror 2: Active Line Demo</h1> + + <form><textarea id="code" name="code"> +<?xml version="1.0" encoding="UTF-8"?> +<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0" + xmlns:georss="http://www.georss.org/georss" + xmlns:twitter="http://api.twitter.com"> + <channel> + <title>Twitter / codemirror</title> + <link>http://twitter.com/codemirror</link> + <atom:link type="application/rss+xml" + href="http://twitter.com/statuses/user_timeline/242283288.rss" rel="self"/> + <description>Twitter updates from CodeMirror / codemirror.</description> + <language>en-us</language> + <ttl>40</ttl> + <item> + <title>codemirror: http://cloud-ide.com — they're springing up like mushrooms. This one + uses CodeMirror as its editor.</title> + <description>codemirror: http://cloud-ide.com — they're springing up like mushrooms. This + one uses CodeMirror as its editor.</description> + <pubDate>Thu, 17 Mar 2011 23:34:47 +0000</pubDate> + <guid>http://twitter.com/codemirror/statuses/48527733722058752</guid> + <link>http://twitter.com/codemirror/statuses/48527733722058752</link> + <twitter:source>web</twitter:source> + <twitter:place/> + </item> + <item> + <title>codemirror: Posted a description of the CodeMirror 2 internals at + http://codemirror.net/2/internals.html</title> + <description>codemirror: Posted a description of the CodeMirror 2 internals at + http://codemirror.net/2/internals.html</description> + <pubDate>Wed, 02 Mar 2011 12:15:09 +0000</pubDate> + <guid>http://twitter.com/codemirror/statuses/42920879788789760</guid> + <link>http://twitter.com/codemirror/statuses/42920879788789760</link> + <twitter:source>web</twitter:source> + <twitter:place/> + </item> +</feed></textarea></form> + + <script> +var editor = CodeMirror.fromTextArea(document.getElementById("code"), { + mode: "application/xml", + lineNumbers: true, + onCursorActivity: function() { + editor.setLineClass(hlLine, null); + hlLine = editor.setLineClass(editor.getCursor().line, "activeline"); + } +}); +var hlLine = editor.setLineClass(0, "activeline"); +</script> + + <p>Styling the current cursor line.</p> + + </body> +</html> Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/demo/complete.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/demo/complete.html (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/demo/complete.html 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,79 @@ +<!doctype html> +<html> + <head> + <title>CodeMirror 2: Autocomplete Demo</title> + <link rel="stylesheet" href="../lib/codemirror.css"> + <script src="../lib/codemirror.js"></script> + <link rel="stylesheet" href="../mode/javascript/javascript.css"> + <script src="../mode/javascript/javascript.js"></script> + <link rel="stylesheet" href="../css/docs.css"> + + <style type="text/css"> + .completions { + position: absolute; + z-index: 10; + overflow: hidden; + -webkit-box-shadow: 2px 3px 5px rgba(0,0,0,.2); + -moz-box-shadow: 2px 3px 5px rgba(0,0,0,.2); + box-shadow: 2px 3px 5px rgba(0,0,0,.2); + } + .completions select { + background: #fafafa; + outline: none; + border: none; + padding: 0; + margin: 0; + font-family: monospace; + } + .CodeMirror { + border: 1px solid #eee; + } + </style> + </head> + <body> + <h1>CodeMirror 2: Autocomplete demo</h1> + + <form><textarea id="code" name="code"> +function getCompletions(token, context) { + var found = [], start = token.string; + function maybeAdd(str) { + if (str.indexOf(start) == 0) found.push(str); + } + function gatherCompletions(obj) { + if (typeof obj == "string") forEach(stringProps, maybeAdd); + else if (obj instanceof Array) forEach(arrayProps, maybeAdd); + else if (obj instanceof Function) forEach(funcProps, maybeAdd); + for (var name in obj) maybeAdd(name); + } + + if (context) { + // If this is a property, see if it belongs to some object we can + // find in the current environment. + var obj = context.pop(), base; + if (obj.className == "js-variable") + base = window[obj.string]; + else if (obj.className == "js-string") + base = ""; + else if (obj.className == "js-atom") + base = 1; + while (base != null && context.length) + base = base[context.pop().string]; + if (base != null) gatherCompletions(base); + } + else { + // If not, just look in the window object and any local scope + // (reading into JS mode internals to get at the local variables) + for (var v = token.state.localVars; v; v = v.next) maybeAdd(v.name); + gatherCompletions(window); + forEach(keywords, maybeAdd); + } + return found; +} +</textarea></form> + +<p>Press <strong>ctrl-space</strong> to activate autocompletion. See +the <a href="complete.js">code</a> to figure out how it works.</p> + + <script src="complete.js"></script> + </body> +</html> Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/demo/complete.js =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/demo/complete.js (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/demo/complete.js 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,150 @@ +(function () { + // Minimal event-handling wrapper. + function stopEvent() { + if (this.preventDefault) {this.preventDefault(); this.stopPropagation();} + else {this.returnValue = false; this.cancelBubble = true;} + } + function addStop(event) { + if (!event.stop) event.stop = stopEvent; + return event; + } + function connect(node, type, handler) { + function wrapHandler(event) {handler(addStop(event || window.event));} + if (typeof node.addEventListener == "function") + node.addEventListener(type, wrapHandler, false); + else + node.attachEvent("on" + type, wrapHandler); + } + + function forEach(arr, f) { + for (var i = 0, e = arr.length; i < e; ++i) f(arr[i]); + } + + var editor = CodeMirror.fromTextArea(document.getElementById("code"), { + lineNumbers: true, + onKeyEvent: function(i, e) { + // Hook into ctrl-space + if (e.keyCode == 32 && (e.ctrlKey || e.metaKey) && !e.altKey) { + e.stop(); + return startComplete(); + } + } + }); + + function startComplete() { + // We want a single cursor position. + if (editor.somethingSelected()) return; + // Find the token at the cursor + var cur = editor.getCursor(false), token = editor.getTokenAt(cur), tprop = token; + // If it's not a 'word-style' token, ignore the token. + if (!/^[\w$_]*$/.test(token.string)) { + token = tprop = {start: cur.ch, end: cur.ch, string: "", state: token.state, + className: token.string == "." ? "js-property" : null}; + } + // If it is a property, find out what it is a property of. + while (tprop.className == "js-property") { + tprop = editor.getTokenAt({line: cur.line, ch: tprop.start}); + if (tprop.string != ".") return; + tprop = editor.getTokenAt({line: cur.line, ch: tprop.start}); + if (!context) var context = []; + context.push(tprop); + } + var completions = getCompletions(token, context); + if (!completions.length) return; + function insert(str) { + editor.replaceRange(str, {line: cur.line, ch: token.start}, {line: cur.line, ch: token.end}); + } + // When there is only one completion, use it directly. + if (completions.length == 1) {insert(completions[0]); return true;} + + // Build the select widget + var complete = document.createElement("div"); + complete.className = "completions"; + var sel = complete.appendChild(document.createElement("select")); + sel.multiple = true; + for (var i = 0; i < completions.length; ++i) { + var opt = sel.appendChild(document.createElement("option")); + opt.appendChild(document.createTextNode(completions[i])); + } + sel.firstChild.selected = true; + sel.size = Math.min(10, completions.length); + var pos = editor.cursorCoords(); + complete.style.left = pos.x + "px"; + complete.style.top = pos.yBot + "px"; + document.body.appendChild(complete); + // Hack to hide the scrollbar. + if (completions.length <= 10) + complete.style.width = (sel.clientWidth - 1) + "px"; + + var done = false; + function close() { + if (done) return; + done = true; + complete.parentNode.removeChild(complete); + } + function pick() { + insert(sel.options[sel.selectedIndex].value); + close(); + setTimeout(function(){editor.focus();}, 50); + } + connect(sel, "blur", close); + connect(sel, "keydown", function(event) { + var code = event.keyCode; + // Enter and space + if (code == 13 || code == 32) {event.stop(); pick();} + // Escape + else if (code == 27) {event.stop(); close(); editor.focus();} + else if (code != 38 && code != 40) {close(); editor.focus(); setTimeout(startComplete, 50);} + }); + connect(sel, "dblclick", pick); + + sel.focus(); + // Opera sometimes ignores focusing a freshly created node + if (window.opera) setTimeout(function(){if (!done) sel.focus();}, 100); + return true; + } + + var stringProps = ("charAt charCodeAt indexOf lastIndexOf substring substr slice trim trimLeft trimRight " + + "toUpperCase toLowerCase split concat match replace search").split(" "); + var arrayProps = ("length concat join splice push pop shift unshift slice reverse sort indexOf " + + "lastIndexOf every some filter forEach map reduce reduceRight ").split(" "); + var funcProps = "prototype apply call bind".split(" "); + var keywords = ("break case catch continue debugger default delete do else false finally for function " + + "if in instanceof new null return switch throw true try typeof var void while with").split(" "); + + function getCompletions(token, context) { + var found = [], start = token.string; + function maybeAdd(str) { + if (str.indexOf(start) == 0) found.push(str); + } + function gatherCompletions(obj) { + if (typeof obj == "string") forEach(stringProps, maybeAdd); + else if (obj instanceof Array) forEach(arrayProps, maybeAdd); + else if (obj instanceof Function) forEach(funcProps, maybeAdd); + for (var name in obj) maybeAdd(name); + } + + if (context) { + // If this is a property, see if it belongs to some object we can + // find in the current environment. + var obj = context.pop(), base; + if (obj.className == "js-variable") + base = window[obj.string]; + else if (obj.className == "js-string") + base = ""; + else if (obj.className == "js-atom") + base = 1; + while (base != null && context.length) + base = base[context.pop().string]; + if (base != null) gatherCompletions(base); + } + else { + // If not, just look in the window object and any local scope + // (reading into JS mode internals to get at the local variables) + for (var v = token.state.localVars; v; v = v.next) maybeAdd(v.name); + gatherCompletions(window); + forEach(keywords, maybeAdd); + } + return found; + } +})(); Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/demo/marker.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/demo/marker.html (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/demo/marker.html 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,53 @@ +<!doctype html> +<html> + <head> + <title>CodeMirror 2: Breakpoint Demo</title> + <link rel="stylesheet" href="../lib/codemirror.css"> + <script src="../lib/codemirror.js"></script> + <link rel="stylesheet" href="../mode/javascript/javascript.css"> + <script src="../mode/javascript/javascript.js"></script> + <link rel="stylesheet" href="../css/docs.css"> + + <style type="text/css"> + .CodeMirror-gutter { + width: 3em; + background: white; + } + .CodeMirror { + border: 1px solid #aaa; + } + </style> + </head> + <body> + <h1>CodeMirror 2: Breakpoint demo</h1> + + <form><textarea id="code" name="code"> +CodeMirror.fromTextArea(document.getElementById("code"), { + lineNumbers: true, + onGutterClick: function(cm, n) { + var info = cm.lineInfo(n); + if (info.markerText) + cm.clearMarker(n); + else + cm.setMarker(n, "<span style=\"color: #900\">●</span> %N%"); + } +}); +</textarea></form> + +<p>Click the line-number gutter to add or remove 'breakpoints'.</p> + + <script> + CodeMirror.fromTextArea(document.getElementById("code"), { + lineNumbers: true, + onGutterClick: function(cm, n) { + var info = cm.lineInfo(n); + if (info.markerText) + cm.clearMarker(n); + else + cm.setMarker(n, "<span style=\"color: #900\">●</span> %N%"); + } + }); + </script> + + </body> +</html> Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/demo/mustache.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/demo/mustache.html (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/demo/mustache.html 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,57 @@ +<!doctype html> +<html> + <head> + <title>CodeMirror 2: Overlay Parser Demo</title> + <link rel="stylesheet" href="../lib/codemirror.css"> + <script src="../lib/codemirror.js"></script> + <script src="../lib/overlay.js"></script> + <link rel="stylesheet" href="../mode/xml/xml.css"> + <script src="../mode/xml/xml.js"></script> + <link rel="stylesheet" href="../css/docs.css"> + + <style type="text/css"> + .CodeMirror {border: 1px solid black;} + .mustache {color: #0ca;} + </style> + </head> + <body> + <h1>CodeMirror 2: Overlay Parser Demo</h1> + + <form><textarea id="code" name="code"> +<html> + <body> + <h1>{{title}}</h1> + <p>These are links to {{things}}:</p> + <ul>{{#links}} + <li><a href="{{url}}">{{text}}</a></li> + {{/links}}</ul> + </body> +</html> +</textarea></form> + + <script> +CodeMirror.defineMode("mustache", function(config, parserConfig) { + var mustacheOverlay = { + token: function(stream, state) { + if (stream.match("{{")) { + while ((ch = stream.next()) != null) + if (ch == "}" && stream.next() == "}") break; + return "mustache"; + } + while (stream.next() != null && !stream.match("{{", false)) {} + return null; + } + }; + return CodeMirror.overlayParser(CodeMirror.getMode(config, parserConfig.backdrop || "text/html"), mustacheOverlay); +}); +var editor = CodeMirror.fromTextArea(document.getElementById("code"), {mode: "mustache"}); +</script> + + <p>Demonstration of a mode that parses HTML, highlighting + the <a href="http://mustache.github.com/">Mustache</a> templating + directives inside of it by using the code + in <a href="../lib/overlay.js"><code>overlay.js</code></a>. View + source to see the 15 lines of code needed to accomplish this.</p> + + </body> +</html> Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/demo/resize.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/demo/resize.html (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/demo/resize.html 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,38 @@ +<!doctype html> +<html> + <head> + <title>CodeMirror 2: Autoresize Demo</title> + <link rel="stylesheet" href="../lib/codemirror.css"> + <script src="../lib/codemirror.js"></script> + <link rel="stylesheet" href="../mode/css/css.css"> + <script src="../mode/css/css.js"></script> + <link rel="stylesheet" href="../css/docs.css"> + + <style type="text/css"> + .CodeMirror { + border: 1px solid #eee; + height: auto; + } + </style> + </head> + <body> + <h1>CodeMirror 2: Autoresize demo</h1> + + <form><textarea id="code" name="code"> +.CodeMirror { + height: auto; +}</textarea></form> + +<p>By setting a single CSS property, CodeMirror can be made to +automatically resize to fit the content. Use <code>max-height</code> +to prevent it from growing past a given point (on halfway modern +browsers).</p> + + <script> + CodeMirror.fromTextArea(document.getElementById("code"), { + lineNumbers: true + }); + </script> + + </body> +</html> Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/demo/search.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/demo/search.html (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/demo/search.html 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,106 @@ +<!doctype html> +<html> + <head> + <title>CodeMirror 2: Search/Replace Demo</title> + <link rel="stylesheet" href="../lib/codemirror.css"> + <script src="../lib/codemirror.js"></script> + <link rel="stylesheet" href="../mode/xml/xml.css"> + <script src="../mode/xml/xml.js"></script> + <link rel="stylesheet" href="../css/docs.css"> + + <style type="text/css"> + .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;} + .searched {background: yellow;} + </style> + </head> + <body> + <h1>CodeMirror 2: Search/Replace Demo</h1> + + <form><textarea id="code" name="code"> + <dt id="option_indentWithTabs"><code>indentWithTabs (boolean)</code></dt> + <dd>Whether, when indenting, the first N*8 spaces should be + replaced by N tabs. Default is false.</dd> + + <dt id="option_tabMode"><code>tabMode (string)</code></dt> + <dd>Determines what happens when the user presses the tab key. + Must be one of the following: + <dl> + <dt><code>"classic" (the default)</code></dt> + <dd>When nothing is selected, insert a tab. Otherwise, + behave like the <code>"shift"</code> mode. (When shift is + held, this behaves like the <code>"indent"</code> mode.)</dd> + <dt><code>"shift"</code></dt> + <dd>Indent all selected lines by + one <a href="#option_indentUnit"><code>indentUnit</code></a>. + If shift was held while pressing tab, un-indent all selected + lines one unit.</dd> + <dt><code>"indent"</code></dt> + <dd>Indent the line the 'correctly', based on its syntactic + context. Only works if the + mode <a href="#indent">supports</a> it.</dd> + <dt><code>"default"</code></dt> + <dd>Do not capture tab presses, let the browser apply its + default behaviour (which usually means it skips to the next + control).</dd> + </dl></dd> + + <dt id="option_enterMode"><code>enterMode (string)</code></dt> + <dd>Determines whether and how new lines are indented when the + enter key is pressed. The following modes are supported: + <dl> + <dt><code>"indent" (the default)</code></dt> + <dd>Use the mode's indentation rules to give the new line + the correct indentation.</dd> + <dt><code>"keep"</code></dt> + <dd>Indent the line the same as the previous line.</dd> + <dt><code>"flat"</code></dt> + <dd>Do not indent the new line.</dd> + </dl></dd> +</textarea></form> +<button type=button onclick="search()">Search</button> +<input type=text style="width: 5em" id=query value=indent> or +<button type=button onclick="replace()">replace</button> it by +<input type=text style="width: 5em" id=replace> + + <script> +var editor = CodeMirror.fromTextArea(document.getElementById("code"), {mode: "text/html", lineNumbers: true}); + +var lastPos = null, lastQuery = null, marked = []; + +function unmark() { + for (var i = 0; i < marked.length; ++i) marked[i](); + marked.length = 0; +} + +function search() { + unmark(); + var text = document.getElementById("query").value; + if (!text) return; + for (var cursor = editor.getSearchCursor(text); cursor.findNext();) + marked.push(editor.markText(cursor.from(), cursor.to(), "searched")); + + if (lastQuery != text) lastPos = null; + var cursor = editor.getSearchCursor(text, lastPos || editor.getCursor()); + if (!cursor.findNext()) { + cursor = editor.getSearchCursor(text); + if (!cursor.findNext()) return; + } + editor.setSelection(cursor.from(), cursor.to()); + lastQuery = text; lastPos = cursor.to(); +} + +function replace() { + unmark(); + var text = document.getElementById("query").value, + replace = document.getElementById("replace").value; + if (!text) return; + for (var cursor = editor.getSearchCursor(text); cursor.findNext();) + editor.replaceRange(replace, cursor.from(), cursor.to()); +} +</script> + + <p>Demonstration of search/replace functionality and marking + text.</p> + + </body> +</html> Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/index.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/index.html (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/index.html 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,225 @@ +<!doctype html> +<html> + <head> + <title>CodeMirror</title> + <link rel="stylesheet" type="text/css" href="css/docs.css"/> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> + <link rel="alternate" href="http://twitter.com/statuses/user_timeline/242283288.rss" type="application/rss+xml"/> + </head> + <body> + +<h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMirror</a></h1> + +<pre class="grey"> +<img src="css/baboon.png" class="logo" alt="logo"/>/* In-browser code editing + made bearable */ +</pre> + +<div class="clear"><div class="left blk"> + + <p style="margin-top: 0">CodeMirror is a JavaScript library that can + be used to create a relatively pleasant editor interface for + code-like content ― computer programs, HTML markup, and + similar. If a mode has been written for the language you are + editing, the code will be coloured, and the editor will optionally + help you with indentation.</p> + + <p>This is the project page for CodeMirror 2, the currently more + actively developed, and recommended + version. <a href="1/index.html">CodeMirror 1</a> is still available + from here.</p> + + <div class="clear"><div class="left1 blk"> + + <h2 style="margin-top: 0">Supported modes:</h2> + + <ul> + <li><a href="mode/javascript/index.html">JavaScript</a></li> + <li><a href="mode/xml/index.html">XML/HTML</a></li> + <li><a href="mode/css/index.html">CSS</a></li> + <li><a href="mode/htmlmixed/index.html">HTML mixed-mode</a></li> + <li><a href="mode/php/index.html">PHP</a></li> + <li><a href="mode/diff/index.html">diff</a></li> + <li><a href="mode/clike/index.html">C, Java, and similar</a></li> + <li><a href="mode/stex/index.html">sTeX, LaTeX</a></li> + <li><a href="mode/haskell/index.html">Haskell</a></li> + </ul> + + </div><div class="left2 blk"> + + <h2 style="margin-top: 0">Usage demos:</h2> + + <ul> + <li><a href="demo/complete.html">Autocompletion</a></li> + <li><a href="demo/mustache.html">Mode overlays</a></li> + <li><a href="demo/search.html">Search/replace</a></li> + <li><a href="demo/resize.html">Auto-resizing editor</a></li> + <li><a href="demo/marker.html">Setting breakpoints</a></li> + <li><a href="demo/activeline.html">Highlighting the current line</a></li> + </ul> + + </div></div> + + <h2 id="code">Getting the code</h2> + + <p>All of CodeMirror is released under a <a + href="LICENSE">MIT-style</a> license. To get it, you can download + the <a href="http://codemirror.net/codemirror.zip">latest + release</a> or the current <a + href="http://codemirror.net/codemirror-latest.zip">development + snapshot</a> as zip files. To create a custom minified script file, + you can use the <a href="compress.html">compression API</a>.</p> + + <p>We use <a href="http://git-scm.com/">git</a> for version control. + The main repository can be fetched in this way:</p> + + <pre class="code">git clone http://marijnhaverbeke.nl/git/codemirror2</pre> + + <p>CodeMirror can also be found on GitHub at <a + href="http://github.com/marijnh/CodeMirror2">marijnh/CodeMirror2</a>. + If you plan to hack on the code and contribute patches, the best way + to do it is to create a GitHub fork, and send pull requests.</p> + + <h2 id="documention">Documentation</h2> + + <p>The <a href="manual.html">manual</a> is your first stop for + learning how to use this library. It starts with a quick explanation + of how to use the editor, and then describes all of the (many) + options and methods that CodeMirror exposes.</p> + + <p>For those who want to learn more about the code, there is + an <a href="internals.html">overview of the internals</a> available. + The <a href="http://github.com/marijnh/CodeMirror2">source code</a> + itself is, for the most part, also well commented.</p> + + <h2 id="support">Support and bug reports</h2> + + <p>There is + a <a href="http://groups.google.com/group/codemirror">Google + group</a> (a sort of mailing list/newsgroup thing) for discussion + and news related to CodeMirror. Reporting bugs is best done + on <a href="http://github.com/marijnh/CodeMirror2/issues">github</a>. + You can also e-mail me + directly: <a href="mailto:marijnh@gmail.com">Marijn + Haverbeke</a>.</p> + + <h2 id="supported">Supported browsers</h2> + + <p>The following browsers are able to run CodeMirror:</p> + + <ul> + <li>Firefox 2 or higher</li> + <li>Chrome, any version</li> + <li>Safari 3 or higher</li> + <li>Internet Explorer 6 or higher</li> + <li>Opera 9 or higher (with some key-handling problems on OS X)</li> + </ul> + + <p>I am not actively testing against every new browser release, and + vendors have a habit of introducing bugs all the time, so I am + relying on the community to tell me when something breaks. + See <a href="#support">below</a> for information on how to contact + me.</p> + +</div> + +<div class="right blk"> + + <a href="http://codemirror.net/codemirror.zip" class="download">Download the latest release</a> + + <h2>Make a donation</h2> + + <ul> + <li><span onclick="document.getElementById('paypal').submit();" class="quasilink">Paypal</span></li> + <li><span onclick="document.getElementById('bankinfo').style.display = 'block';" class="quasilink">Bank</span></li> + </ul> + + <p id="bankinfo" style="display: none;"> + Bank: <i>Rabobank</i><br/> + Country: <i>Netherlands</i><br/> + SWIFT: <i>RABONL2U</i><br/> + Account: <i>147850770</i><br/> + Name: <i>Marijn Haverbeke</i><br/> + IBAN: <i>NL26 RABO 0147 8507 70</i> + </p> + + <h2>Releases:</h2> + + <p class="rel">28-03-2011: <a href="http://codemirror.net/codemirror-2.0.zip">Version 2.0</a>:</p> + <p class="rel-note">CodeMirror 2 is a complete rewrite that's + faster, smaller, simpler to use, and less dependent on browser + quirks. See <a href="internals.html">this</a> + and <a href="http://groups.google.com/group/codemirror/browse_thread/thread/5a8e894024a9…">this</a> + for more information.</a> + + <p class="rel">28-03-2011: <a href="http://codemirror.net/codemirror-1.0.zip">Version 1.0</a>:</p> + <ul class="rel-note"> + <li>Fix error when debug history overflows.</li> + <li>Refine handling of C# verbatim strings.</li> + <li>Fix some issues with JavaScript indentation.</li> + </ul> + + <p class="rel">22-02-2011: <a href="https://github.com/marijnh/codemirror2/tree/beta2">Version 2.0 beta 2</a>:</p> + <p class="rel-note">Somewhate more mature API, lots of bugs shaken out.</a> + + <p class="rel">17-02-2011: <a href="http://codemirror.net/codemirror-0.94.zip">Version 0.94</a>:</p> + <ul class="rel-note"> + <li><code>tabMode: "spaces"</code> was modified slightly (now indents when something is selected).</li> + <li>Fixes a bug that would cause the selection code to break on some IE versions.</li> + <li>Disabling spell-check on WebKit browsers now works.</li> + </ul> + + <p class="rel">08-02-2011: <a href="http://codemirror.net/2/">Version 2.0 beta 1</a>:</p> + <p class="rel-note">CodeMirror 2 is a complete rewrite of + CodeMirror, no longer depending on an editable frame.</p> + + <p class="rel">19-01-2011: <a href="http://codemirror.net/codemirror-0.93.zip">Version 0.93</a>:</p> + <ul class="rel-note"> + <li>Added a <a href="contrib/regex/index.html">Regular Expression</a> parser.</li> + <li>Fixes to the PHP parser.</li> + <li>Support for regular expression in search/replace.</li> + <li>Add <code>save</code> method to instances created with <code>fromTextArea</code>.</li> + <li>Add support for MS T-SQL in the SQL parser.</li> + <li>Support use of CSS classes for highlighting brackets.</li> + <li>Fix yet another hang with line-numbering in hidden editors.</li> + </ul> + + <p class="rel">17-12-2010: <a href="http://codemirror.net/codemirror-0.92.zip">Version 0.92</a>:</p> + <ul class="rel-note"> + <li>Make CodeMirror work in XHTML documents.</li> + <li>Fix bug in handling of backslashes in Python strings.</li> + <li>The <code>styleNumbers</code> option is now officially + supported and documented.</li> + <li><code>onLineNumberClick</code> option added.</li> + <li>More consistent names <code>onLoad</code> and + <code>onCursorActivity</code> callbacks. Old names still work, but + are deprecated.</li> + <li>Add a <a href="contrib/freemarker/index.html">Freemarker</a> mode.</li> + </ul> + + <p class="rel">11-11-2010: <a + href="http://codemirror.net/codemirror-0.91.zip">Version 0.91</a>:</p> + <ul class="rel-note"> + <li>Adds support for <a href="contrib/java">Java</a>.</li> + <li>Small additions to the <a href="contrib/php">PHP</a> and <a href="contrib/sql">SQL</a> parsers.</li> + <li>Work around various <a href="https://bugs.webkit.org/show_bug.cgi?id=47806">Webkit</a> <a href="https://bugs.webkit.org/show_bug.cgi?id=23474">issues</a>.</li> + <li>Fix <code>toTextArea</code> to update the code in the textarea.</li> + <li>Add a <code>noScriptCaching</code> option (hack to ease development).</li> + <li>Make sub-modes of <a href="mixedtest.html">HTML mixed</a> mode configurable.</li> + </ul> + + <p><a href="oldrelease.html">Older releases...</a></p> + +</div></div> + +<div style="height: 2em"> </div> + + <form action="https://www.paypal.com/cgi-bin/webscr" method="post" id="paypal"> + <input type="hidden" name="cmd" value="_s-xclick"/> + <input type="hidden" name="hosted_button_id" value="3FVHS5FGUY7CC"/> + </form> + + <script type="text/javascript" src="css/font.js"></script> + + </body> +</html> Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/internals.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/internals.html (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/internals.html 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,352 @@ +<!doctype html> +<html><head> +<title>CodeMirror 2: (Re-) Implementing A Syntax-Highlighting Editor in JavaScript</title> +<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> +<link rel="stylesheet" href="docs.css"> +</head><body> + +<h1>(Re-) Implementing A Syntax-Highlighting Editor in JavaScript</h1> + +<p style="font-size: 85%"> + <strong>Topic:</strong> JavaScript, code editor implementation<br> + <strong>Author:</strong> Marijn Haverbeke<br> + <strong>Date:</strong> March 2nd 2011 +</p> + +<p>This is a followup to +my <a href="http://codemirror.net/story.html">Brutal Odyssey to the +Dark Side of the DOM Tree</a> story. That one describes the +mind-bending process of implementing (what would become) CodeMirror 1. +This one describes the internals of CodeMirror 2, a complete rewrite +and rethink of the old code base. I wanted to give this piece another +Hunter Thompson copycat subtitle, but somehow that would be out of +place—the process this time around was one of straightforward +engineering, requiring no serious mind-bending whatsoever.</p> + +<p>So, what is wrong with CodeMirror 1? I'd estimate, by mailing list +activity and general search-engine presence, that it has been +integrated into about a thousand systems by now. The most prominent +one, since a few weeks, +being <a href="http://googlecode.blogspot.com/2011/01/make-quick-fixes-quicker-on-google.h…">Google +code's project hosting</a>. It works, and it's being used widely.</a> + +<p>Still, I did not start replacing it because I was bored. CodeMirror +1 was heavily reliant on <code>designMode</code> +or <code>contentEditable</code> (depending on the browser). Neither of +these are well specified (HTML5 tries +to <a href="http://www.w3.org/TR/html5/editing.html#contenteditable">specify</a> +their basics), and, more importantly, they tend to be one of the more +obscure and buggy areas of browser functionality—CodeMirror, by using +this functionality in a non-typical way, was constantly running up +against browser bugs. WebKit wouldn't show an empty line at the end of +the document, and in some releases would suddenly get unbearably slow. +Firefox would show the cursor in the wrong place. Internet Explorer +would insist on linkifying everything that looked like a URL or email +address, a behaviour that can't be turned off. Some bugs I managed to +work around (which was often a frustrating, painful process), others, +such as the Firefox cursor placement, I gave up on, and had to tell +user after user that they were known problems, but not something I +could help.</p> + +<p>Also, there is the fact that <code>designMode</code> (which seemed +to be less buggy than <code>contentEditable</code> in Webkit and +Firefox, and was thus used by CodeMirror 1 in those browsers) requires +a frame. Frames are another tricky area. It takes some effort to +prevent getting tripped up by domain restrictions, they don't +initialize synchronously, behave strangely in response to the back +button, and, on several browsers, can't be moved around the DOM +without having them re-initialize. They did provide a very nice way to +namespace the library, though—CodeMirror 1 could freely pollute the +namespace inside the frame.</p> + +<p>Finally, working with an editable document means working with +selection in arbitrary DOM structures. Internet Explorer (8 and +before) has an utterly different (and awkward) selection API than all +of the other browsers, and even among the different implementations of +<code>document.selection</code>, details about how exactly a selection +is represented vary quite a bit. Add to that the fact that Opera's +selection support tended to be very buggy until recently, and you can +imagine why CodeMirror 1 contains 700 lines of selection-handling +code.</p> + +<p>And that brings us to the main issue with the CodeMirror 1 +code base: The proportion of browser-bug-workarounds to real +application code was getting dangerously high. By building on top of a +few dodgy features, I put the system in a vulnerable position—any +incompatibility and bugginess in these features, I had to paper over +with my own code. Not only did I have to do some serious stunt-work to +get it to work on older browsers (as detailed in the +previous <a href="http://codemirror.net/story.html">story</a>), things +also kept breaking in newly released versions, requiring me to come up +with <em>new</em> scary hacks in order to keep up. This was starting +to lose its appeal.</p> + +<h2>General Approach</h2> + +<p>What CodeMirror 2 does is try to sidestep most of the hairy hacks +that came up in version 1. I owe a lot to the +<a href="http://ace.ajax.org">ACE</a> editor for inspiration on how to +approach this.</p> + +<p>I absolutely did not want to be completely reliant on key events to +generate my input. Every JavaScript programmer knows that key event +information is horrible and incomplete. Some people (most awesomely +Mihai Bazon with <a href="http://ymacs.org">Ymacs</a>) have been able +to build more or less functioning editors by directly reading key +events, but it takes a lot of work (the kind of never-ending, fragile +work I described earlier), and will never be able to properly support +things like multi-keystoke international character input.</p> + +<p>So what I do is focus a hidden textarea, and let the browser +believe that the user is typing into that. What we show to the user is +a DOM structure we built to represent his document. If this is updated +quickly enough, and shows some kind of believable cursor, it feels +like a real text-input control.</p> + +<p>Another big win is that this DOM representation does not have to +span the whole document. Some CodeMirror 1 users insisted that they +needed to put a 30 thousand line XML document into CodeMirror. Putting +all that into the DOM takes a while, especially since, for some +reason, an editable DOM tree is slower than a normal one on most +browsers. If we have full control over what we show, we must only +ensure that the visible part of the document has been added, and can +do the rest only when needed. (Fortunately, the <code>onscroll</code> +event works almost the same on all browsers, and lends itself well to +displaying things only as they are scrolled into view.)</p> + +<h2>Input</h2> + +<p>ACE uses its hidden textarea only as a text input shim, and does +all cursor movement and things like text deletion itself by directly +handling key events. CodeMirror's way is to let the browser do its +thing as much as possible, and not, for example, define its own set of +key bindings. One way to do this would have been to have the whole +document inside the hidden textarea, and after each key event update +the display DOM to reflect what's in that textarea.</p> + +<p>That'd be simple, but it is not realistic. For even medium-sized +document the editor would be constantly munging huge strings, and get +terribly slow. What CodeMirror 2 does is put the current selection, +along with an extra line on the top and on the bottom, into the +textarea.</p> + +<p>This means that the arrow keys (and their ctrl-variations), home, +end, etcetera, do not have to be handled specially. We just read the +cursor position in the textarea, and update our cursor to match it. +Also, copy and paste work pretty much for free, and people get their +native key bindings, without any special work on my part. For example, +I have emacs key bindings configured for Chrome and Firefox. There is +no way for a script to detect this.</p> + +<p>Of course, since only a small part of the document sits in the +textarea, keys like page up and ctrl-end won't do the right thing. +CodeMirror is catching those events and handling them itself.</p> + +<h2>Selection</h2> + +<p>Getting and setting the selection range of a textarea in modern +browsers is trivial—you just use the <code>selectionStart</code> +and <code>selectionEnd</code> properties. On IE you have to do some +insane stuff with temporary ranges and compensating for the fact that +moving the selection by a 'character' will treat \r\n as a single +character, but even there it is possible to build functions that +reliably set and get the selection range.</p> + +<p>But consider this typical case: When I'm somewhere in my document, +press shift, and press the up arrow, something gets selected. Then, if +I, still holding shift, press the up arrow again, the top of my +selection is adjusted. The selection remembers where its <em>head</em> +and its <em>anchor</em> are, and moves the head when we shift-move. +This is a generally accepted property of selections, and done right by +every editing component built in the past twenty years.</p> + +<p>But not something that the browser selection APIs expose.</p> + +<p>Great. So when someone creates an 'upside-down' selection, the next +time CodeMirror has to update the textarea, it'll re-create the +selection as an 'upside-up' selection, with the anchor at the top, and +the next cursor motion will behave in an unexpected way—our second +up-arrow press in the example above will not do anything, since it is +interpreted in exactly the same way as the first.</p> + +<p>No problem. We'll just, ehm, detect that the selection is +upside-down (you can tell by the way it was created), and then, when +an upside-down selection is present, and a cursor-moving key is +pressed in combination with shift, we quickly collapse the selection +in the textarea to its start, allow the key to take effect, and then +combine its new head with its old anchor to get the <em>real</em> +selection.</p> + +<p>In short, scary hacks could not be avoided entirely in CodeMirror +2.</p> + +<p>And, the observant reader might ask, how do you even know that a +key combo is a cursor-moving combo, if you claim you support any +native key bindings? Well, we don't, but we can learn. The editor +keeps a set known cursor-movement combos (initialized to the +predictable defaults), and updates this set when it observes that +pressing a certain key had (only) the effect of moving the cursor. +This, of course, doesn't work if the first time the key is used was +for extending an inverted selection, but it works most of the +time.</p> + +<h2>Intelligent Updating</h2> + +<p>One thing that always comes up when you have a complicated internal +state that's reflected in some user-visible external representation +(in this case, the displayed code and the textarea's content) is +keeping the two in sync. The naive way is to just update the display +every time you change your state, but this is not only error prone +(you'll forget), it also easily leads to duplicate work on big, +composite operations. Then you start passing around flags indicating +whether the display should be updated in an attempt to be efficient +again and, well, at that point you might as well give up completely.</p> + +<p>I did go down that road, but then switched to a much simpler model: +simply keep track of all the things that have been changed during an +action, and then, only at the end, use this information to update the +user-visible display.</p> + +<p>CodeMirror uses a concept of <em>operations</em>, which start by +calling a specific set-up function that clears the state and end by +calling another function that reads this state and does the required +updating. Most event handlers, and all the user-visible methods that +change state are wrapped like this. There's a method +called <code>operation</code> that accepts a function, and returns +another function that wraps the given function as an operation.</p> + +<p>It's trivial to extend this (as CodeMirror does) to detect nesting, +and, when an operation is started inside an operation, simply +increment the nesting count, and only do the updating when this count +reaches zero again.</p> + +<p>If we have a set of changed ranges and know the currently shown +range, we can (with some awkward code to deal with the fact that +changes can add and remove lines, so we're dealing with a changing +coordinate system) construct a map of the ranges that were left +intact. We can then compare this map with the part of the document +that's currently visible (based on scroll offset and editor height) to +determine whether something needs to be updated.</p> + +<p>CodeMirror uses two update algorithms—a full refresh, where it just +discards the whole part of the DOM that contains the edited text and +rebuilds it, and a patch algorithm, where it uses the information +about changed and intact ranges to update only the out-of-date parts +of the DOM. When more than 30 percent (which is the current heuristic, +might change) of the lines need to be updated, the full refresh is +chosen (since it's faster to do than painstakingly finding and +updating all the changed lines), in the other case it does the +patching (so that, if you scroll a line or select another character, +the whole screen doesn't have to be re-rendered).</p> + +<p>All updating uses <code>innerHTML</code> rather than direct DOM +manipulation, since that still seems to be by far the fastest way to +build documents. There's a per-line function that combines the +highlighting, <a href="manual.html#markText">marking</a>, and +selection info for that line into a snippet of HTML. The patch updater +uses this to reset individual lines, the refresh updater builds an +HTML chunk for the whole visible document at once, and then uses a +single <code>innerHTML</code> update to do the refresh.</p> + +<h2>Parsers can be Simple</h2> + +<p>When I wrote CodeMirror 1, I +thought <a href="http://codemirror.net/story.html#parser">interruptable +parsers</a> were a hugely scary and complicated thing, and I used a +bunch of heavyweight abstractions to keep this supposed complexity +under control: parsers +were <a href="http://bob.pythonmac.org/archives/2005/07/06/iteration-in-javascript/">iterators</a> +that consumed input from another iterator, and used funny +closure-resetting tricks to copy and resume themselves.</p> + +<p>This made for a rather nice system, in that parsers formed strictly +separate modules, and could be composed in predictable ways. +Unfortunately, it was quite slow (stacking three or four iterators on +top of each other), and extremely intimidating to people not used to a +functional programming style.</p> + +<p>With a few small changes, however, we can keep all those +advantages, but simplify the API and make the whole thing less +indirect and inefficient. CodeMirror +2's <a href="manual.html#modeapi">mode API</a> uses explicit state +objects, and makes the parser/tokenizer a function that simply takes a +state and a character stream abstraction, advances the stream one +token, and returns the way the token should be styled. This state may +be copied, optionally in a mode-defined way, in order to be able to +continue a parse at a given point. Even someone who's never touched a +lambda in his life can understand this approach. Additionally, far +fewer objects are allocated in the course of parsing now.</p> + +<p>The biggest speedup comes from the fact that the parsing no longer +has to touch the DOM though. In CodeMirror 1, on an older browser, you +could <em>see</em> the parser work its way through the document, +managing some twenty lines in each 50-millisecond time slice it got. It +was reading its input from the DOM, and updating the DOM as it went +along, which any experienced JavaScript programmer will immediately +spot as a recipe for slowness. In CodeMirror 2, the parser usually +finishes the whole document in a single 100-millisecond time slice—it +manages some 1500 lines during that time on Chrome. All it has to do +is munge strings, so there is no real reason for it to be slow +anymore.</p> + +<h2>What Gives?</h2> + +<p>Given all this, what can you expect from CodeMirror 2? First, the +good:</p> + +<ul> + +<li><strong>Small.</strong> the base library is some 32k when minified +now, 12k when gzipped. It's smaller than its own logo.</li> + +<li><strong>Lightweight.</strong> CodeMirror 2 initializes very +quickly, and does almost no work when it is not focused. This means +you can treat it almost like a textarea, have multiple instances on a +page without trouble.</li> + +<li><strong>Huge document support.</strong> Since highlighting is +really fast, and no DOM structure is being built for non-visible +content, you don't have to worry about locking up your browser when a +user enters a megabyte-sized document.</li> + +<li><strong>Extended API.</strong> Some things kept coming up in the +mailing list, such as marking pieces of text or lines, which were +extremely hard to do with CodeMirror 1. The new version has proper +support for these built in.</li> + +<li><strong>Tab support.</strong> Tabs inside editable documents were, +for some reason, a no-go. At least six different people announced they +were going to add tab support to CodeMirror 1, none survived (I mean, +none delivered a working version). CodeMirror 2 no longer removes tabs +from your document.</li> + +<li><strong>Sane styling.</strong> <code>iframe</code> nodes aren't +really known for respecting document flow. Now that an editor instance +is a plain <code>div</code> element, it is much easier to size it to +fit the surrounding elements. You don't even have to make it scroll if +you do not <a href="demo/resize.html">want to</a>.</li> + +</ul> + +<p>Then, the bad:</p> + +<ul> + +<li><strong>No line-wrapping.</strong> I'd have liked to get +line-wrapping to work, but it doesn't match the model I'm using very +well. It is important that cursor movement in the textarea matches +what you see on the screen, and it seems to be impossible to have the +lines wrapped the same in the textarea and the normal DOM.</li> + +<li><strong>Some cursor flakiness.</strong> The textarea hack does not +really do justice to the complexity of cursor handling—a selection is +typically more than just an offset into a string. For example, if you +use the up and down arrow keys to move to a shorter line and then +back, you'll end up in your old position in most editor controls, but +CodeMirror 2 currently doesn't remember the 'real' cursor column in +this case. These can be worked around on a case-by-case basis, but +I haven't put much energy into that yet.</li> + +</ul> + +</body></html> Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/lib/codemirror.css =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/lib/codemirror.css (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/lib/codemirror.css 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,53 @@ +.CodeMirror { + overflow: auto; + height: 300px; + line-height: 1em; + font-family: monospace; + _position: relative; /* IE6 hack */ +} + +.CodeMirror-gutter { + position: absolute; left: 0; top: 0; + background-color: #f7f7f7; + border-right: 1px solid #eee; + min-width: 2em; + height: 100%; +} +.CodeMirror-gutter-text { + color: #aaa; + text-align: right; + padding: .4em .2em .4em .4em; +} +.CodeMirror-lines { + padding: .4em; +} + +.CodeMirror pre { + -moz-border-radius: 0; + -webkit-border-radius: 0; + -o-border-radius: 0; + border-radius: 0; + border-width: 0; margin: 0; padding: 0; background: transparent; + font-family: inherit; +} + +.CodeMirror-cursor { + z-index: 10; + position: absolute; + visibility: hidden; + border-left: 1px solid black !important; +} +.CodeMirror-focused .CodeMirror-cursor { + visibility: visible; +} + +span.CodeMirror-selected { + background: #ccc !important; + color: HighlightText !important; +} +.CodeMirror-focused span.CodeMirror-selected { + background: Highlight !important; +} + +.CodeMirror-matchingbracket {color: #0f0 !important;} +.CodeMirror-nonmatchingbracket {color: #f22 !important;} Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/lib/codemirror.js =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/lib/codemirror.js (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/lib/codemirror.js 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,1915 @@ +// All functions that need access to the editor's state live inside +// the CodeMirror function. Below that, at the bottom of the file, +// some utilities are defined. + +// CodeMirror is the only global var we claim +var CodeMirror = (function() { + // This is the function that produces an editor instance. It's + // closure is used to store the editor state. + function CodeMirror(place, givenOptions) { + // Determine effective options based on given values and defaults. + var options = {}, defaults = CodeMirror.defaults; + for (var opt in defaults) + if (defaults.hasOwnProperty(opt)) + options[opt] = (givenOptions && givenOptions.hasOwnProperty(opt) ? givenOptions : defaults)[opt]; + + // The element in which the editor lives. Takes care of scrolling + // (if enabled). + var wrapper = document.createElement("div"); + wrapper.className = "CodeMirror"; + // This mess creates the base DOM structure for the editor. + wrapper.innerHTML = + '<div style="position: relative">' + // Set to the height of the text, causes scrolling + '<pre style="position: relative; height: 0; visibility: hidden; overflow: hidden;">' + // To measure line/char size + '<span>xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx</span></pre>' + + '<div style="position: relative">' + // Moved around its parent to cover visible view + '<div class="CodeMirror-gutter"><div class="CodeMirror-gutter-text"></div></div>' + + '<div style="overflow: hidden; position: absolute; width: 0; left: 0">' + // Wraps and hides input textarea + '<textarea style="height: 1px; position: absolute; width: 1px;" wrap="off"></textarea></div>' + + // Provides positioning relative to (visible) text origin + '<div class="CodeMirror-lines"><div style="position: relative">' + + '<pre class="CodeMirror-cursor"> </pre>' + // Absolutely positioned blinky cursor + '<div></div></div></div></div></div>'; // This DIV contains the actual code + if (place.appendChild) place.appendChild(wrapper); else place(wrapper); + // I've never seen more elegant code in my life. + var code = wrapper.firstChild, measure = code.firstChild, mover = measure.nextSibling, + gutter = mover.firstChild, gutterText = gutter.firstChild, + inputDiv = gutter.nextSibling, input = inputDiv.firstChild, + lineSpace = inputDiv.nextSibling.firstChild, cursor = lineSpace.firstChild, lineDiv = cursor.nextSibling; + if (options.tabindex != null) input.tabindex = options.tabindex; + if (!options.gutter && !options.lineNumbers) gutter.style.display = "none"; + + // Delayed object wrap timeouts, making sure only one is active. blinker holds an interval. + var poll = new Delayed(), highlight = new Delayed(), blinker; + + // mode holds a mode API object. lines an array of Line objects + // (see Line constructor), work an array of lines that should be + // parsed, and history the undo history (instance of History + // constructor). + var mode, lines = [new Line("")], work, history = new History(), focused; + loadMode(); + // The selection. These are always maintained to point at valid + // positions. Inverted is used to remember that the user is + // selecting bottom-to-top. + var sel = {from: {line: 0, ch: 0}, to: {line: 0, ch: 0}, inverted: false}; + // Selection-related flags. shiftSelecting obviously tracks + // whether the user is holding shift. reducedSelection is a hack + // to get around the fact that we can't create inverted + // selections. See below. + var shiftSelecting, reducedSelection; + // Variables used by startOperation/endOperation to track what + // happened during the operation. + var updateInput, changes, textChanged, selectionChanged, leaveInputAlone; + // Current visible range (may be bigger than the view window). + var showingFrom = 0, showingTo = 0, lastHeight = 0, curKeyId = null; + // editing will hold an object describing the things we put in the + // textarea, to help figure out whether something changed. + // bracketHighlighted is used to remember that a backet has been + // marked. + var editing, bracketHighlighted; + + // Initialize the content. Somewhat hacky (delayed prepareInput) + // to work around browser issues. + operation(function(){setValue(options.value || ""); updateInput = false;})(); + setTimeout(prepareInput, 20); + + // Register our event handlers. + connect(wrapper, "mousedown", operation(onMouseDown)); + // Gecko browsers fire contextmenu *after* opening the menu, at + // which point we can't mess with it anymore. Context menu is + // handled in onMouseDown for Gecko. + if (!gecko) connect(wrapper, "contextmenu", operation(onContextMenu)); + connect(code, "dblclick", operation(onDblClick)); + connect(wrapper, "scroll", function() {updateDisplay([]); if (options.onScroll) options.onScroll(instance);}); + connect(window, "resize", function() {updateDisplay(true);}); + connect(input, "keyup", operation(onKeyUp)); + connect(input, "keydown", operation(onKeyDown)); + connect(input, "keypress", operation(onKeyPress)); + connect(input, "focus", onFocus); + connect(input, "blur", onBlur); + + connect(wrapper, "dragenter", function(e){e.stop();}); + connect(wrapper, "dragover", function(e){e.stop();}); + connect(wrapper, "drop", operation(onDrop)); + connect(wrapper, "paste", function(){input.focus(); fastPoll();}); + connect(input, "paste", function(){fastPoll();}); + connect(input, "cut", function(){fastPoll();}); + + if (document.activeElement == input) onFocus(); + else onBlur(); + + function isLine(l) {return l >= 0 && l < lines.length;} + // The instance object that we'll return. Mostly calls out to + // local functions in the CodeMirror function. Some do some extra + // range checking and/or clipping. operation is used to wrap the + // call so that changes it makes are tracked, and the display is + // updated afterwards. + var instance = { + getValue: getValue, + setValue: operation(setValue), + getSelection: getSelection, + replaceSelection: operation(replaceSelection), + focus: function(){input.focus(); onFocus(); fastPoll();}, + setOption: function(option, value) { + options[option] = value; + if (option == "lineNumbers" || option == "gutter") gutterChanged(); + else if (option == "mode" || option == "indentUnit") loadMode(); + }, + getOption: function(option) {return options[option];}, + undo: operation(undo), + redo: operation(redo), + indentLine: operation(function(n) {if (isLine(n)) indentLine(n, "smart");}), + historySize: function() {return {undo: history.done.length, redo: history.undone.length};}, + matchBrackets: operation(function(){matchBrackets(true);}), + getTokenAt: function(pos) { + pos = clipPos(pos); + return lines[pos.line].getTokenAt(mode, getStateBefore(pos.line), pos.ch); + }, + cursorCoords: function(start){ + if (start == null) start = sel.inverted; + return pageCoords(start ? sel.from : sel.to); + }, + charCoords: function(pos){return pageCoords(clipPos(pos));}, + coordsChar: function(coords) { + var off = eltOffset(lineSpace); + var line = Math.min(showingTo - 1, showingFrom + Math.floor(coords.y / lineHeight())); + return clipPos({line: line, ch: charFromX(clipLine(line), coords.x)}); + }, + getSearchCursor: function(query, pos, caseFold) {return new SearchCursor(query, pos, caseFold);}, + markText: operation(function(a, b, c){return operation(markText(a, b, c));}), + setMarker: addGutterMarker, + clearMarker: removeGutterMarker, + setLineClass: operation(setLineClass), + lineInfo: lineInfo, + addWidget: function(pos, node, scroll) { + var pos = localCoords(clipPos(pos), true); + node.style.top = (showingFrom * lineHeight() + pos.yBot + paddingTop()) + "px"; + node.style.left = (pos.x + paddingLeft()) + "px"; + code.appendChild(node); + if (scroll) + scrollIntoView(pos.x, pos.yBot, pos.x + node.offsetWidth, pos.yBot + node.offsetHeight); + }, + + lineCount: function() {return lines.length;}, + getCursor: function(start) { + if (start == null) start = sel.inverted; + return copyPos(start ? sel.from : sel.to); + }, + somethingSelected: function() {return !posEq(sel.from, sel.to);}, + setCursor: operation(function(line, ch) { + if (ch == null && typeof line.line == "number") setCursor(line.line, line.ch); + else setCursor(line, ch); + }), + setSelection: operation(function(from, to) {setSelection(clipPos(from), clipPos(to || from));}), + getLine: function(line) {if (isLine(line)) return lines[line].text;}, + setLine: operation(function(line, text) { + if (isLine(line)) replaceRange(text, {line: line, ch: 0}, {line: line, ch: lines[line].text.length}); + }), + removeLine: operation(function(line) { + if (isLine(line)) replaceRange("", {line: line, ch: 0}, clipPos({line: line+1, ch: 0})); + }), + replaceRange: operation(replaceRange), + getRange: function(from, to) {return getRange(clipPos(from), clipPos(to));}, + + operation: function(f){return operation(f)();}, + refresh: function(){updateDisplay(true);}, + getInputField: function(){return input;}, + getWrapperElement: function(){return wrapper;} + }; + + function setValue(code) { + history = null; + var top = {line: 0, ch: 0}; + updateLines(top, {line: lines.length - 1, ch: lines[lines.length-1].text.length}, + splitLines(code), top, top); + history = new History(); + } + function getValue(code) { + var text = []; + for (var i = 0, l = lines.length; i < l; ++i) + text.push(lines[i].text); + return text.join("\n"); + } + + function onMouseDown(e) { + // First, see if this is a click in the gutter + for (var n = e.target(); n != wrapper; n = n.parentNode) + if (n.parentNode == gutterText) { + if (options.onGutterClick) + options.onGutterClick(instance, indexOf(gutterText.childNodes, n) + showingFrom); + return e.stop(); + } + + if (gecko && e.button() == 3) onContextMenu(e); + if (e.button() != 1) return; + // For button 1, if it was clicked inside the editor + // (posFromMouse returning non-null), we have to adjust the + // selection. + var start = posFromMouse(e), last = start, going; + if (!start) {if (e.target() == wrapper) e.stop(); return;} + setCursor(start.line, start.ch, false); + + if (!focused) onFocus(); + e.stop(); + // And then we have to see if it's a drag event, in which case + // the dragged-over text must be selected. + function end() { + input.focus(); + updateInput = true; + move(); up(); + } + function extend(e) { + var cur = posFromMouse(e, true); + if (cur && !posEq(cur, last)) { + if (!focused) onFocus(); + last = cur; + setSelection(start, cur); + updateInput = false; + var visible = visibleLines(); + if (cur.line >= visible.to || cur.line < visible.from) + going = setTimeout(operation(function(){extend(e);}), 150); + } + } + + var move = connect(document, "mousemove", operation(function(e) { + clearTimeout(going); + e.stop(); + extend(e); + }), true); + var up = connect(document, "mouseup", operation(function(e) { + clearTimeout(going); + var cur = posFromMouse(e); + if (cur) setSelection(start, cur); + e.stop(); + end(); + }), true); + } + function onDblClick(e) { + var pos = posFromMouse(e); + if (!pos) return; + selectWordAt(pos); + e.stop(); + } + function onDrop(e) { + var pos = posFromMouse(e, true), files = e.e.dataTransfer.files; + if (!pos || options.readOnly) return; + if (files && files.length && window.FileReader && window.File) { + var n = files.length, text = Array(n), read = 0; + for (var i = 0; i < n; ++i) loadFile(files[i], i); + function loadFile(file, i) { + var reader = new FileReader; + reader.onload = function() { + text[i] = reader.result; + if (++read == n) replaceRange(text.join(""), clipPos(pos), clipPos(pos)); + }; + reader.readAsText(file); + } + } + else { + try { + var text = e.e.dataTransfer.getData("Text"); + if (text) replaceRange(text, pos, pos); + } + catch(e){} + } + } + function onKeyDown(e) { + if (!focused) onFocus(); + + var code = e.e.keyCode; + // Tries to detect ctrl on non-mac, cmd on mac. + var mod = (mac ? e.e.metaKey : e.e.ctrlKey) && !e.e.altKey, anyMod = e.e.ctrlKey || e.e.altKey || e.e.metaKey; + if (code == 16 || e.e.shiftKey) shiftSelecting = shiftSelecting || (sel.inverted ? sel.to : sel.from); + else shiftSelecting = null; + // First give onKeyEvent option a chance to handle this. + if (options.onKeyEvent && options.onKeyEvent(instance, addStop(e.e))) return; + + if (code == 33 || code == 34) {scrollPage(code == 34); return e.stop();} // page up/down + if (mod && (code == 36 || code == 35)) {scrollEnd(code == 36); return e.stop();} // ctrl-home/end + if (mod && code == 65) {selectAll(); return e.stop();} // ctrl-a + if (!options.readOnly) { + if (!anyMod && code == 13) {return;} // enter + if (!anyMod && code == 9 && handleTab(e.e.shiftKey)) return e.stop(); // tab + if (mod && code == 90) {undo(); return e.stop();} // ctrl-z + if (mod && ((e.e.shiftKey && code == 90) || code == 89)) {redo(); return e.stop();} // ctrl-shift-z, ctrl-y + } + + // Key id to use in the movementKeys map. We also pass it to + // fastPoll in order to 'self learn'. We need this because + // reducedSelection, the hack where we collapse the selection to + // its start when it is inverted and a movement key is pressed + // (and later restore it again), shouldn't be used for + // non-movement keys. + curKeyId = (mod ? "c" : "") + code; + if (sel.inverted && movementKeys.hasOwnProperty(curKeyId)) { + var range = selRange(input); + if (range) { + reducedSelection = {anchor: range.start}; + setSelRange(input, range.start, range.start); + } + } + fastPoll(curKeyId); + } + function onKeyUp(e) { + if (reducedSelection) { + reducedSelection = null; + updateInput = true; + } + if (e.e.keyCode == 16) shiftSelecting = null; + } + function onKeyPress(e) { + if (options.onKeyEvent && options.onKeyEvent(instance, addStop(e.e))) return; + if (options.electricChars && mode.electricChars) { + var ch = String.fromCharCode(e.e.charCode == null ? e.e.keyCode : e.e.charCode); + if (mode.electricChars.indexOf(ch) > -1) + setTimeout(operation(function() {indentLine(sel.to.line, "smart");}), 50); + } + var code = e.e.keyCode; + // Re-stop tab and enter. Necessary on some browsers. + if (code == 13) {handleEnter(); e.stop();} + else if (code == 9 && options.tabMode != "default") e.stop(); + else fastPoll(curKeyId); + } + + function onFocus() { + if (!focused && options.onFocus) options.onFocus(instance); + focused = true; + slowPoll(); + if (wrapper.className.search(/\bCodeMirror-focused\b/) == -1) + wrapper.className += " CodeMirror-focused"; + restartBlink(); + } + function onBlur() { + if (focused && options.onBlur) options.onBlur(instance); + clearInterval(blinker); + shiftSelecting = null; + focused = false; + wrapper.className = wrapper.className.replace(" CodeMirror-focused", ""); + } + + // Replace the range from from to to by the strings in newText. + // Afterwards, set the selection to selFrom, selTo. + function updateLines(from, to, newText, selFrom, selTo) { + if (history) { + var old = []; + for (var i = from.line, e = to.line + 1; i < e; ++i) old.push(lines[i].text); + history.addChange(from.line, newText.length, old); + while (history.done.length > options.undoDepth) history.done.shift(); + } + updateLinesNoUndo(from, to, newText, selFrom, selTo); + } + function unredoHelper(from, to) { + var change = from.pop(); + if (change) { + var replaced = [], end = change.start + change.added; + for (var i = change.start; i < end; ++i) replaced.push(lines[i].text); + to.push({start: change.start, added: change.old.length, old: replaced}); + var pos = clipPos({line: change.start + change.old.length - 1, + ch: editEnd(replaced[replaced.length-1], change.old[change.old.length-1])}); + updateLinesNoUndo({line: change.start, ch: 0}, {line: end - 1, ch: lines[end-1].text.length}, change.old, pos, pos); + } + } + function undo() {unredoHelper(history.done, history.undone);} + function redo() {unredoHelper(history.undone, history.done);} + + function updateLinesNoUndo(from, to, newText, selFrom, selTo) { + var nlines = to.line - from.line, firstLine = lines[from.line], lastLine = lines[to.line]; + // First adjust the line structure, taking some care to leave highlighting intact. + if (firstLine == lastLine) { + if (newText.length == 1) + firstLine.replace(from.ch, to.ch, newText[0]); + else { + lastLine = firstLine.split(to.ch, newText[newText.length-1]); + var spliceargs = [from.line + 1, nlines]; + firstLine.replace(from.ch, firstLine.text.length, newText[0]); + for (var i = 1, e = newText.length - 1; i < e; ++i) spliceargs.push(new Line(newText[i])); + spliceargs.push(lastLine); + lines.splice.apply(lines, spliceargs); + } + } + else if (newText.length == 1) { + firstLine.replace(from.ch, firstLine.text.length, newText[0] + lastLine.text.slice(to.ch)); + lines.splice(from.line + 1, nlines); + } + else { + var spliceargs = [from.line + 1, nlines - 1]; + firstLine.replace(from.ch, firstLine.text.length, newText[0]); + lastLine.replace(0, to.ch, newText[newText.length-1]); + for (var i = 1, e = newText.length - 1; i < e; ++i) spliceargs.push(new Line(newText[i])); + lines.splice.apply(lines, spliceargs); + } + + // Add these lines to the work array, so that they will be + // highlighted. Adjust work lines if lines were added/removed. + var newWork = [], lendiff = newText.length - nlines - 1; + for (var i = 0, l = work.length; i < l; ++i) { + var task = work[i]; + if (task < from.line) newWork.push(task); + else if (task > to.line) newWork.push(task + lendiff); + } + if (newText.length) newWork.push(from.line); + work = newWork; + startWorker(100); + // Remember that these lines changed, for updating the display + changes.push({from: from.line, to: to.line + 1, diff: lendiff}); + textChanged = true; + + // Update the selection + function updateLine(n) {return n <= Math.min(to.line, to.line + lendiff) ? n : n + lendiff;} + setSelection(selFrom, selTo, updateLine(sel.from.line), updateLine(sel.to.line)); + + // Make sure the scroll-size div has the correct height. + code.style.height = (lines.length * lineHeight() + 2 * paddingTop()) + "px"; + } + + function replaceRange(code, from, to) { + from = clipPos(from); + if (!to) to = from; else to = clipPos(to); + code = splitLines(code); + function adjustPos(pos) { + if (posLess(pos, from)) return pos; + if (!posLess(to, pos)) return end; + var line = pos.line + code.length - (to.line - from.line) - 1; + var ch = pos.ch; + if (pos.line == to.line) + ch += code[code.length-1].length - (to.ch - (to.line == from.line ? from.ch : 0)); + return {line: line, ch: ch}; + } + var end; + replaceRange1(code, from, to, function(end1) { + end = end1; + return {from: adjustPos(sel.from), to: adjustPos(sel.to)}; + }); + return end; + } + function replaceSelection(code, collapse) { + replaceRange1(splitLines(code), sel.from, sel.to, function(end) { + if (collapse == "end") return {from: end, to: end}; + else if (collapse == "start") return {from: sel.from, to: sel.from}; + else return {from: sel.from, to: end}; + }); + } + function replaceRange1(code, from, to, computeSel) { + var endch = code.length == 1 ? code[0].length + from.ch : code[code.length-1].length; + var newSel = computeSel({line: from.line + code.length - 1, ch: endch}); + updateLines(from, to, code, newSel.from, newSel.to); + } + + function getRange(from, to) { + var l1 = from.line, l2 = to.line; + if (l1 == l2) return lines[l1].text.slice(from.ch, to.ch); + var code = [lines[l1].text.slice(from.ch)]; + for (var i = l1 + 1; i < l2; ++i) code.push(lines[i].text); + code.push(lines[l2].text.slice(0, to.ch)); + return code.join("\n"); + } + function getSelection() { + return getRange(sel.from, sel.to); + } + + var pollingFast = false; // Ensures slowPoll doesn't cancel fastPoll + function slowPoll() { + if (pollingFast) return; + poll.set(2000, function() { + startOperation(); + readInput(); + if (focused) slowPoll(); + endOperation(); + }); + } + function fastPoll(keyId) { + var missed = false; + pollingFast = true; + function p() { + startOperation(); + var changed = readInput(); + if (changed == "moved" && keyId) movementKeys[keyId] = true; + if (!changed && !missed) {missed = true; poll.set(80, p);} + else {pollingFast = false; slowPoll();} + endOperation(); + } + poll.set(20, p); + } + + // Inspects the textarea, compares its state (content, selection) + // to the data in the editing variable, and updates the editor + // content or cursor if something changed. + function readInput() { + var changed = false, text = input.value, sr = selRange(input); + if (!sr) return false; + var changed = editing.text != text, rs = reducedSelection; + var moved = changed || sr.start != editing.start || sr.end != (rs ? editing.start : editing.end); + if (reducedSelection && !moved && sel.from.line == 0 && sel.from.ch == 0) + reducedSelection = null; + else if (!moved) return false; + if (changed) { + shiftSelecting = reducedSelection = null; + if (options.readOnly) {updateInput = true; return "changed";} + } + + // Compute selection start and end based on start/end offsets in textarea + function computeOffset(n, startLine) { + var pos = 0; + for (;;) { + var found = text.indexOf("\n", pos); + if (found == -1 || (text.charAt(found-1) == "\r" ? found - 1 : found) >= n) + return {line: startLine, ch: n - pos}; + ++startLine; + pos = found + 1; + } + } + var from = computeOffset(sr.start, editing.from), + to = computeOffset(sr.end, editing.from); + // Here we have to take the reducedSelection hack into account, + // so that you can, for example, press shift-up at the start of + // your selection and have the right thing happen. + if (rs) { + from = sr.start == rs.anchor ? to : from; + to = shiftSelecting ? sel.to : sr.start == rs.anchor ? from : to; + if (!posLess(from, to)) { + reducedSelection = null; + sel.inverted = false; + var tmp = from; from = to; to = tmp; + } + } + + // In some cases (cursor on same line as before), we don't have + // to update the textarea content at all. + if (from.line == to.line && from.line == sel.from.line && from.line == sel.to.line && !shiftSelecting) + updateInput = false; + + // Magic mess to extract precise edited range from the changed + // string. + if (changed) { + var start = 0, end = text.length, len = Math.min(end, editing.text.length); + var c, line = editing.from, nl = -1; + while (start < len && (c = text.charAt(start)) == editing.text.charAt(start)) { + ++start; + if (c == "\n") {line++; nl = start;} + } + var ch = nl > -1 ? start - nl : start, endline = editing.to - 1, edend = editing.text.length; + for (;;) { + c = editing.text.charAt(edend); + if (c == "\n") endline--; + if (text.charAt(end) != c) {++end; ++edend; break;} + if (edend <= start || end <= start) break; + --end; --edend; + } + var nl = editing.text.lastIndexOf("\n", edend - 1), endch = nl == -1 ? edend : edend - nl - 1; + updateLines({line: line, ch: ch}, {line: endline, ch: endch}, splitLines(text.slice(start, end)), from, to); + if (line != endline || from.line != line) updateInput = true; + } + else setSelection(from, to); + + editing.text = text; editing.start = sr.start; editing.end = sr.end; + return changed ? "changed" : moved ? "moved" : false; + } + + // Set the textarea content and selection range to match the + // editor state. + function prepareInput() { + var text = []; + var from = Math.max(0, sel.from.line - 1), to = Math.min(lines.length, sel.to.line + 2); + for (var i = from; i < to; ++i) text.push(lines[i].text); + text = input.value = text.join(lineSep); + var startch = sel.from.ch, endch = sel.to.ch; + for (var i = from; i < sel.from.line; ++i) + startch += lineSep.length + lines[i].text.length; + for (var i = from; i < sel.to.line; ++i) + endch += lineSep.length + lines[i].text.length; + editing = {text: text, from: from, to: to, start: startch, end: endch}; + setSelRange(input, startch, reducedSelection ? startch : endch); + } + + function scrollCursorIntoView() { + var cursor = localCoords(sel.inverted ? sel.from : sel.to); + return scrollIntoView(cursor.x, cursor.y, cursor.x, cursor.yBot); + } + function scrollIntoView(x1, y1, x2, y2) { + var pl = paddingLeft(), pt = paddingTop(); + y1 += pt; y2 += pt; x1 += pl; x2 += pl; + var screen = wrapper.clientHeight, screentop = wrapper.scrollTop, scrolled = false, result = true; + if (y1 < screentop) {wrapper.scrollTop = Math.max(0, y1 - 10); scrolled = true;} + else if (y2 > screentop + screen) {wrapper.scrollTop = y2 + 10 - screen; scrolled = true;} + + var screenw = wrapper.clientWidth, screenleft = wrapper.scrollLeft; + if (x1 < screenleft) {wrapper.scrollLeft = Math.max(0, x1 - 10); scrolled = true;} + else if (x2 > screenw + screenleft) { + wrapper.scrollLeft = x2 + 10 - screenw; + scrolled = true; + if (x2 > code.clientWidth) result = false; + } + if (scrolled && options.onScroll) options.onScroll(instance); + return result; + } + + function visibleLines() { + var lh = lineHeight(), top = wrapper.scrollTop - paddingTop(); + return {from: Math.min(lines.length, Math.max(0, Math.floor(top / lh))), + to: Math.min(lines.length, Math.ceil((top + wrapper.clientHeight) / lh))}; + } + // Uses a set of changes plus the current scroll position to + // determine which DOM updates have to be made, and makes the + // updates. + function updateDisplay(changes) { + if (!wrapper.clientWidth) { + showingFrom = showingTo = 0; + return; + } + // First create a range of theoretically intact lines, and punch + // holes in that using the change info. + var intact = changes === true ? [] : [{from: showingFrom, to: showingTo, domStart: 0}]; + for (var i = 0, l = changes.length || 0; i < l; ++i) { + var change = changes[i], intact2 = [], diff = change.diff || 0; + for (var j = 0, l2 = intact.length; j < l2; ++j) { + var range = intact[j]; + if (change.to <= range.from) + intact2.push({from: range.from + diff, to: range.to + diff, domStart: range.domStart}); + else if (range.to <= change.from) + intact2.push(range); + else { + if (change.from > range.from) + intact2.push({from: range.from, to: change.from, domStart: range.domStart}) + if (change.to < range.to) + intact2.push({from: change.to + diff, to: range.to + diff, + domStart: range.domStart + (change.to - range.from)}); + } + } + intact = intact2; + } + + // Then, determine which lines we'd want to see, and which + // updates have to be made to get there. + var visible = visibleLines(); + var from = Math.min(showingFrom, Math.max(visible.from - 3, 0)), + to = Math.min(lines.length, Math.max(showingTo, visible.to + 3)), + updates = [], domPos = 0, domEnd = showingTo - showingFrom, pos = from, changedLines = 0; + + for (var i = 0, l = intact.length; i < l; ++i) { + var range = intact[i]; + if (range.to <= from) continue; + if (range.from >= to) break; + if (range.domStart > domPos || range.from > pos) { + updates.push({from: pos, to: range.from, domSize: range.domStart - domPos, domStart: domPos}); + changedLines += range.from - pos; + } + pos = range.to; + domPos = range.domStart + (range.to - range.from); + } + if (domPos != domEnd || pos != to) { + changedLines += Math.abs(to - pos); + updates.push({from: pos, to: to, domSize: domEnd - domPos, domStart: domPos}); + } + + if (!updates.length) return; + lineDiv.style.display = "none"; + // If more than 30% of the screen needs update, just do a full + // redraw (which is quicker than patching) + if (changedLines > (visible.to - visible.from) * .3) + refreshDisplay(from = Math.max(visible.from - 10, 0), to = Math.min(visible.to + 7, lines.length)); + // Otherwise, only update the stuff that needs updating. + else + patchDisplay(updates); + lineDiv.style.display = ""; + + // Position the mover div to align with the lines it's supposed + // to be showing (which will cover the visible display) + var different = from != showingFrom || to != showingTo || lastHeight != wrapper.clientHeight; + showingFrom = from; showingTo = to; + mover.style.top = (from * lineHeight()) + "px"; + if (different) { + lastHeight = wrapper.clientHeight; + code.style.height = (lines.length * lineHeight() + 2 * paddingTop()) + "px"; + updateGutter(); + } + + // Since this is all rather error prone, it is honoured with the + // only assertion in the whole file. + if (lineDiv.childNodes.length != showingTo - showingFrom) + throw new Error("BAD PATCH! " + JSON.stringify(updates) + " size=" + (showingTo - showingFrom) + + " nodes=" + lineDiv.childNodes.length); + updateCursor(); + } + + function refreshDisplay(from, to) { + var html = [], start = {line: from, ch: 0}, inSel = posLess(sel.from, start) && !posLess(sel.to, start); + for (var i = from; i < to; ++i) { + var ch1 = null, ch2 = null; + if (inSel) { + ch1 = 0; + if (sel.to.line == i) {inSel = false; ch2 = sel.to.ch;} + } + else if (sel.from.line == i) { + if (sel.to.line == i) {ch1 = sel.from.ch; ch2 = sel.to.ch;} + else {inSel = true; ch1 = sel.from.ch;} + } + html.push(lines[i].getHTML(ch1, ch2, true)); + } + lineDiv.innerHTML = html.join(""); + } + function patchDisplay(updates) { + // Slightly different algorithm for IE (badInnerHTML), since + // there .innerHTML on PRE nodes is dumb, and discards + // whitespace. + var sfrom = sel.from.line, sto = sel.to.line, off = 0, + scratch = badInnerHTML && document.createElement("div"); + for (var i = 0, e = updates.length; i < e; ++i) { + var rec = updates[i]; + var extra = (rec.to - rec.from) - rec.domSize; + var nodeAfter = lineDiv.childNodes[rec.domStart + rec.domSize + off] || null; + if (badInnerHTML) + for (var j = Math.max(-extra, rec.domSize); j > 0; --j) + lineDiv.removeChild(nodeAfter ? nodeAfter.previousSibling : lineDiv.lastChild); + else if (extra) { + for (var j = Math.max(0, extra); j > 0; --j) + lineDiv.insertBefore(document.createElement("pre"), nodeAfter); + for (var j = Math.max(0, -extra); j > 0; --j) + lineDiv.removeChild(nodeAfter ? nodeAfter.previousSibling : lineDiv.lastChild); + } + var node = lineDiv.childNodes[rec.domStart + off], inSel = sfrom < rec.from && sto >= rec.from; + for (var j = rec.from; j < rec.to; ++j) { + var ch1 = null, ch2 = null; + if (inSel) { + ch1 = 0; + if (sto == j) {inSel = false; ch2 = sel.to.ch;} + } + else if (sfrom == j) { + if (sto == j) {ch1 = sel.from.ch; ch2 = sel.to.ch;} + else {inSel = true; ch1 = sel.from.ch;} + } + if (badInnerHTML) { + scratch.innerHTML = lines[j].getHTML(ch1, ch2, true); + lineDiv.insertBefore(scratch.firstChild, nodeAfter); + } + else { + node.innerHTML = lines[j].getHTML(ch1, ch2, false); + node.className = lines[j].className || ""; + node = node.nextSibling; + } + } + off += extra; + } + } + + function updateGutter() { + if (!options.gutter && !options.lineNumbers) return; + var hText = mover.offsetHeight, hEditor = wrapper.clientHeight; + gutter.style.height = (hText - hEditor < 2 ? hEditor : hText) + "px"; + var html = []; + for (var i = showingFrom; i < showingTo; ++i) { + var marker = lines[i].gutterMarker; + var text = options.lineNumbers ? i + options.firstLineNumber : null; + if (marker && marker.text) + text = marker.text.replace("%N%", text != null ? text : ""); + else if (text == null) + text = "\u00a0"; + html.push((marker && marker.style ? '<pre class="' + marker.style + '">' : "<pre>"), text, "</pre>"); + } + gutter.style.display = "none"; + gutterText.innerHTML = html.join(""); + var minwidth = String(lines.length).length, firstNode = gutterText.firstChild, val = eltText(firstNode), pad = ""; + while (val.length + pad.length < minwidth) pad += "\u00a0"; + if (pad) firstNode.insertBefore(document.createTextNode(pad), firstNode.firstChild); + gutter.style.display = ""; + lineSpace.style.marginLeft = gutter.offsetWidth + "px"; + } + function updateCursor() { + var head = sel.inverted ? sel.from : sel.to; + var x = charX(head.line, head.ch) + "px", y = (head.line - showingFrom) * lineHeight() + "px"; + inputDiv.style.top = y; inputDiv.style.left = x; + if (posEq(sel.from, sel.to)) { + cursor.style.top = y; cursor.style.left = x; + cursor.style.display = ""; + } + else cursor.style.display = "none"; + } + + // Update the selection. Last two args are only used by + // updateLines, since they have to be expressed in the line + // numbers before the update. + function setSelection(from, to, oldFrom, oldTo) { + if (posEq(sel.from, from) && posEq(sel.to, to)) return; + var sh = shiftSelecting && clipPos(shiftSelecting); + if (posLess(to, from)) {var tmp = to; to = from; from = tmp;} + if (sh) { + if (posLess(sh, from)) from = sh; + else if (posLess(to, sh)) to = sh; + } + + var startEq = posEq(sel.to, to), endEq = posEq(sel.from, from); + if (posEq(from, to)) sel.inverted = false; + else if (startEq && !endEq) sel.inverted = true; + else if (endEq && !startEq) sel.inverted = false; + + // Some ugly logic used to only mark the lines that actually did + // see a change in selection as changed, rather than the whole + // selected range. + if (oldFrom == null) {oldFrom = sel.from.line; oldTo = sel.to.line;} + if (posEq(from, to)) { + if (!posEq(sel.from, sel.to)) + changes.push({from: oldFrom, to: oldTo + 1}); + } + else if (posEq(sel.from, sel.to)) { + changes.push({from: from.line, to: to.line + 1}); + } + else { + if (!posEq(from, sel.from)) { + if (from.line < oldFrom) + changes.push({from: from.line, to: Math.min(to.line, oldFrom) + 1}); + else + changes.push({from: oldFrom, to: Math.min(oldTo, from.line) + 1}); + } + if (!posEq(to, sel.to)) { + if (to.line < oldTo) + changes.push({from: Math.max(oldFrom, from.line), to: oldTo + 1}); + else + changes.push({from: Math.max(from.line, oldTo), to: to.line + 1}); + } + } + sel.from = from; sel.to = to; + selectionChanged = true; + } + function setCursor(line, ch) { + var pos = clipPos({line: line, ch: ch || 0}); + setSelection(pos, pos); + } + + function clipLine(n) {return Math.max(0, Math.min(n, lines.length-1));} + function clipPos(pos) { + if (pos.line < 0) return {line: 0, ch: 0}; + if (pos.line >= lines.length) return {line: lines.length-1, ch: lines[lines.length-1].text.length}; + var ch = pos.ch, linelen = lines[pos.line].text.length; + if (ch == null || ch > linelen) return {line: pos.line, ch: linelen}; + else if (ch < 0) return {line: pos.line, ch: 0}; + else return pos; + } + + function scrollPage(down) { + var linesPerPage = Math.floor(wrapper.clientHeight / lineHeight()), head = sel.inverted ? sel.from : sel.to; + setCursor(head.line + (Math.max(linesPerPage - 1, 1) * (down ? 1 : -1)), head.ch); + } + function scrollEnd(top) { + setCursor(top ? 0 : lines.length - 1); + } + function selectAll() { + var endLine = lines.length - 1; + setSelection({line: 0, ch: 0}, {line: endLine, ch: lines[endLine].text.length}); + } + function selectWordAt(pos) { + var line = lines[pos.line].text; + var start = pos.ch, end = pos.ch; + while (start > 0 && /\w/.test(line.charAt(start - 1))) --start; + while (end < line.length - 1 && /\w/.test(line.charAt(end))) ++end; + setSelection({line: pos.line, ch: start}, {line: pos.line, ch: end}); + } + function handleEnter() { + replaceSelection("\n", "end"); + if (options.enterMode != "flat") + indentLine(sel.from.line, options.enterMode == "keep" ? "prev" : "smart"); + } + function handleTab(shift) { + shiftSelecting = null; + switch (options.tabMode) { + case "default": + return false; + case "indent": + for (var i = sel.from.line, e = sel.to.line; i <= e; ++i) indentLine(i, "smart"); + break; + case "classic": + if (posEq(sel.from, sel.to)) { + if (shift) indentLine(sel.from.line, "smart"); + else replaceSelection("\t", "end"); + break; + } + case "shift": + for (var i = sel.from.line, e = sel.to.line; i <= e; ++i) indentLine(i, shift ? "subtract" : "add"); + break; + } + return true; + } + + function indentLine(n, how) { + if (how == "smart") { + if (!mode.indent) how = "prev"; + else var state = getStateBefore(n); + } + + var line = lines[n], curSpace = line.indentation(), curSpaceString = line.text.match(/^\s*/)[0], indentation; + if (how == "prev") { + if (n) indentation = lines[n-1].indentation(); + else indentation = 0; + } + else if (how == "smart") indentation = mode.indent(state, line.text.slice(curSpaceString.length)); + else if (how == "add") indentation = curSpace + options.indentUnit; + else if (how == "subtract") indentation = curSpace - options.indentUnit; + indentation = Math.max(0, indentation); + var diff = indentation - curSpace; + + if (!diff) { + if (sel.from.line != n && sel.to.line != n) return; + var indentString = curSpaceString; + } + else { + var indentString = "", pos = 0; + if (options.indentWithTabs) + for (var i = Math.floor(indentation / tabSize); i; --i) {pos += tabSize; indentString += "\t";} + while (pos < indentation) {++pos; indentString += " ";} + } + + replaceRange(indentString, {line: n, ch: 0}, {line: n, ch: curSpaceString.length}); + } + + function loadMode() { + mode = CodeMirror.getMode(options, options.mode); + for (var i = 0, l = lines.length; i < l; ++i) + lines[i].stateAfter = null; + work = [0]; + } + function gutterChanged() { + var visible = options.gutter || options.lineNumbers; + gutter.style.display = visible ? "" : "none"; + if (visible) updateGutter(); + else lineDiv.parentNode.style.marginLeft = 0; + } + + function markText(from, to, className) { + from = clipPos(from); to = clipPos(to); + var accum = []; + function add(line, from, to, className) { + var line = lines[line], mark = line.addMark(from, to, className); + mark.line = line; + accum.push(mark); + } + if (from.line == to.line) add(from.line, from.ch, to.ch, className); + else { + add(from.line, from.ch, null, className); + for (var i = from.line + 1, e = to.line; i < e; ++i) + add(i, 0, null, className); + add(to.line, 0, to.ch, className); + } + changes.push({from: from.line, to: to.line + 1}); + return function() { + var start, end; + for (var i = 0; i < accum.length; ++i) { + var mark = accum[i], found = indexOf(lines, mark.line); + mark.line.removeMark(mark); + if (found > -1) { + if (start == null) start = found; + end = found; + } + } + if (start != null) changes.push({from: start, to: end + 1}); + }; + } + + function addGutterMarker(line, text, className) { + if (typeof line == "number") line = lines[clipLine(line)]; + line.gutterMarker = {text: text, style: className}; + updateGutter(); + return line; + } + function removeGutterMarker(line) { + if (typeof line == "number") line = lines[clipLine(line)]; + line.gutterMarker = null; + updateGutter(); + } + function setLineClass(line, className) { + if (typeof line == "number") { + var no = line; + line = lines[clipLine(line)]; + } + else { + var no = indexOf(lines, line); + if (no == -1) return null; + } + line.className = className; + changes.push({from: no, to: no + 1}); + return line; + } + + function lineInfo(line) { + if (typeof line == "number") { + var n = line; + line = lines[line]; + if (!line) return null; + } + else { + var n = indexOf(lines, line); + if (n == -1) return null; + } + var marker = line.gutterMarker; + return {line: n, text: line.text, markerText: marker && marker.text, markerClass: marker && marker.style}; + } + + // These are used to go from pixel positions to character + // positions, taking tabs into account. + function charX(line, pos) { + var text = lines[line].text, span = measure.firstChild; + if (text.lastIndexOf("\t", pos) == -1) return pos * charWidth(); + var old = span.firstChild.nodeValue; + try { + span.firstChild.nodeValue = text.slice(0, pos); + return span.offsetWidth; + } finally {span.firstChild.nodeValue = old;} + } + function charFromX(line, x) { + var text = lines[line].text, cw = charWidth(); + if (x <= 0) return 0; + if (text.indexOf("\t") == -1) return Math.min(text.length, Math.round(x / cw)); + var mspan = measure.firstChild, mtext = mspan.firstChild, old = mtext.nodeValue; + try { + mtext.nodeValue = text; + var from = 0, fromX = 0, to = text.length, toX = mspan.offsetWidth; + if (x > toX) return to; + for (;;) { + if (to - from <= 1) return (toX - x > x - fromX) ? from : to; + var middle = Math.ceil((from + to) / 2); + mtext.nodeValue = text.slice(0, middle); + var curX = mspan.offsetWidth; + if (curX > x) {to = middle; toX = curX;} + else {from = middle; fromX = curX;} + } + } finally {mtext.nodeValue = old;} + } + + function localCoords(pos, inLineWrap) { + var lh = lineHeight(), line = pos.line - (inLineWrap ? showingFrom : 0); + return {x: charX(pos.line, pos.ch), y: line * lh, yBot: (line + 1) * lh}; + } + function pageCoords(pos) { + var local = localCoords(pos, true), off = eltOffset(lineSpace); + return {x: off.left + local.x, y: off.top + local.y, yBot: off.top + local.yBot}; + } + + function lineHeight() { + var nlines = lineDiv.childNodes.length; + if (nlines) return lineDiv.offsetHeight / nlines; + else return measure.firstChild.offsetHeight || 1; + } + function charWidth() {return (measure.firstChild.offsetWidth || 320) / 40;} + function paddingTop() {return lineSpace.offsetTop;} + function paddingLeft() {return lineSpace.offsetLeft;} + + function posFromMouse(e, liberal) { + var off = eltOffset(lineSpace), + x = e.pageX() - off.left, + y = e.pageY() - off.top; + if (!liberal && e.target() != lineSpace.parentNode && !(e.target() == wrapper && y > (lines.length * lineHeight()))) + for (var n = e.target(); n != lineDiv && n != cursor; n = n.parentNode) + if (!n || n == wrapper) return null; + var line = showingFrom + Math.floor(y / lineHeight()); + return clipPos({line: line, ch: charFromX(clipLine(line), x)}); + } + function onContextMenu(e) { + var pos = posFromMouse(e); + if (!pos || window.opera) return; // Opera is difficult. + if (posEq(sel.from, sel.to) || posLess(pos, sel.from) || !posLess(pos, sel.to)) + setCursor(pos.line, pos.ch); + + var oldCSS = input.style.cssText; + input.style.cssText = "position: fixed; width: 30px; height: 30px; top: " + (e.pageY() - 1) + + "px; left: " + (e.pageX() - 1) + "px; z-index: 1000; background: white; " + + "border-width: 0; outline: none; overflow: hidden;"; + var val = input.value = getSelection(); + input.focus(); + setSelRange(input, 0, val.length); + if (gecko) e.stop(); + leaveInputAlone = true; + setTimeout(function() { + if (input.value != val) operation(replaceSelection)(input.value, "end"); + input.style.cssText = oldCSS; + leaveInputAlone = false; + prepareInput(); + slowPoll(); + }, 50); + } + + // Cursor-blinking + function restartBlink() { + clearInterval(blinker); + var on = true; + cursor.style.visibility = ""; + blinker = setInterval(function() { + cursor.style.visibility = (on = !on) ? "" : "hidden"; + }, 650); + } + + var matching = {"(": ")>", ")": "(<", "[": "]>", "]": "[<", "{": "}>", "}": "{<"}; + function matchBrackets(autoclear) { + var head = sel.inverted ? sel.from : sel.to, line = lines[head.line], pos = head.ch - 1; + var match = (pos >= 0 && matching[line.text.charAt(pos)]) || matching[line.text.charAt(++pos)]; + if (!match) return; + var ch = match.charAt(0), forward = match.charAt(1) == ">", d = forward ? 1 : -1, st = line.styles; + for (var off = pos + 1, i = 0, e = st.length; i < e; i+=2) + if ((off -= st[i].length) <= 0) {var style = st[i+1]; break;} + + var stack = [line.text.charAt(pos)], re = /[(){}[\]]/; + function scan(line, from, to) { + if (!line.text) return; + var st = line.styles, pos = forward ? 0 : line.text.length - 1, cur; + for (var i = forward ? 0 : st.length - 2, e = forward ? st.length : -2; i != e; i += 2*d) { + var text = st[i]; + if (st[i+1] != null && st[i+1] != style) {pos += d * text.length; continue;} + for (var j = forward ? 0 : text.length - 1, te = forward ? text.length : -1; j != te; j += d, pos+=d) { + if (pos >= from && pos < to && re.test(cur = text.charAt(j))) { + var match = matching[cur]; + if (match.charAt(1) == ">" == forward) stack.push(cur); + else if (stack.pop() != match.charAt(0)) return {pos: pos, match: false}; + else if (!stack.length) return {pos: pos, match: true}; + } + } + } + } + for (var i = head.line, e = forward ? Math.min(i + 50, lines.length) : Math.max(0, i - 50); i != e; i+=d) { + var line = lines[i], first = i == head.line; + var found = scan(line, first && forward ? pos + 1 : 0, first && !forward ? pos : line.text.length); + if (found) { + var style = found.match ? "CodeMirror-matchingbracket" : "CodeMirror-nonmatchingbracket"; + var one = markText({line: head.line, ch: pos}, {line: head.line, ch: pos+1}, style), + two = markText({line: i, ch: found.pos}, {line: i, ch: found.pos + 1}, style); + var clear = operation(function(){one(); two();}); + if (autoclear) setTimeout(clear, 800); + else bracketHighlighted = clear; + break; + } + } + } + + // Finds the line to start with when starting a parse. Tries to + // find a line with a stateAfter, so that it can start with a + // valid state. If that fails, it returns the line with the + // smallest indentation, which tends to need the least context to + // parse correctly. + function findStartLine(n) { + var minindent, minline; + for (var search = n, lim = n - 40; search > lim; --search) { + if (search == 0) return 0; + var line = lines[search-1]; + if (line.stateAfter) return search; + var indented = line.indentation(); + if (minline == null || minindent > indented) { + minline = search; + minindent = indented; + } + } + return minline; + } + function getStateBefore(n) { + var start = findStartLine(n), state = start && lines[start-1].stateAfter; + if (!state) state = startState(mode); + else state = copyState(mode, state); + for (var i = start; i < n; ++i) { + var line = lines[i]; + line.highlight(mode, state); + line.stateAfter = copyState(mode, state); + } + if (!lines[n].stateAfter) work.push(n); + return state; + } + function highlightWorker() { + var end = +new Date + options.workTime; + while (work.length) { + if (!lines[showingFrom].stateAfter) var task = showingFrom; + else var task = work.pop(); + if (task >= lines.length) continue; + var start = findStartLine(task), state = start && lines[start-1].stateAfter; + if (state) state = copyState(mode, state); + else state = startState(mode); + + for (var i = start, l = lines.length; i < l; ++i) { + var line = lines[i], hadState = line.stateAfter; + if (+new Date > end) { + work.push(i); + startWorker(options.workDelay); + changes.push({from: task, to: i}); + return; + } + var changed = line.highlight(mode, state); + line.stateAfter = copyState(mode, state); + if (hadState && !changed && line.text) break; + } + changes.push({from: task, to: i}); + } + } + function startWorker(time) { + if (!work.length) return; + highlight.set(time, operation(highlightWorker)); + } + + // Operations are used to wrap changes in such a way that each + // change won't have to update the cursor and display (which would + // be awkward, slow, and error-prone), but instead updates are + // batched and then all combined and executed at once. + function startOperation() { + updateInput = null; changes = []; textChanged = selectionChanged = false; + } + function endOperation() { + var reScroll = false; + if (selectionChanged) reScroll = !scrollCursorIntoView(); + if (changes.length) updateDisplay(changes); + else if (selectionChanged) updateCursor(); + if (reScroll) scrollCursorIntoView(); + if (selectionChanged) restartBlink(); + + // updateInput can be set to a boolean value to force/prevent an + // update. + if (!leaveInputAlone && (updateInput === true || (updateInput !== false && selectionChanged))) + prepareInput(); + + if (selectionChanged && options.onCursorActivity) + options.onCursorActivity(instance); + if (textChanged && options.onChange) + options.onChange(instance); + if (selectionChanged && options.matchBrackets) + setTimeout(operation(function() { + if (bracketHighlighted) {bracketHighlighted(); bracketHighlighted = null;} + matchBrackets(false); + }), 20); + } + var nestedOperation = 0; + function operation(f) { + return function() { + if (!nestedOperation++) startOperation(); + try {var result = f.apply(this, arguments);} + finally {if (!--nestedOperation) endOperation();} + return result; + }; + } + + function SearchCursor(query, pos, caseFold) { + this.atOccurrence = false; + if (caseFold == null) caseFold = typeof query == "string" && query == query.toLowerCase(); + + if (pos && typeof pos == "object") pos = clipPos(pos); + else pos = {line: 0, ch: 0}; + this.pos = {from: pos, to: pos}; + + // The matches method is filled in based on the type of query. + // It takes a position and a direction, and returns an object + // describing the next occurrence of the query, or null if no + // more matches were found. + if (typeof query != "string") // Regexp match + this.matches = function(reverse, pos) { + if (reverse) { + var line = lines[pos.line].text.slice(0, pos.ch), match = line.match(query), start = 0; + while (match) { + var ind = line.indexOf(match[0]); + start += ind; + line = line.slice(ind + 1); + var newmatch = line.match(query); + if (newmatch) match = newmatch; + else break; + } + } + else { + var line = lines[pos.line].text.slice(pos.ch), match = line.match(query), + start = match && pos.ch + line.indexOf(match[0]); + } + if (match) + return {from: {line: pos.line, ch: start}, + to: {line: pos.line, ch: start + match[0].length}, + match: match}; + }; + else { // String query + if (caseFold) query = query.toLowerCase(); + var fold = caseFold ? function(str){return str.toLowerCase();} : function(str){return str;}; + var target = query.split("\n"); + // Different methods for single-line and multi-line queries + if (target.length == 1) + this.matches = function(reverse, pos) { + var line = fold(lines[pos.line].text), len = query.length, match; + if (reverse ? (pos.ch >= len && (match = line.lastIndexOf(query, pos.ch - len)) != -1) + : (match = line.indexOf(query, pos.ch)) != -1) + return {from: {line: pos.line, ch: match}, + to: {line: pos.line, ch: match + len}}; + }; + else + this.matches = function(reverse, pos) { + var ln = pos.line, idx = (reverse ? target.length - 1 : 0), match = target[idx], line = fold(lines[ln].text); + var offsetA = (reverse ? line.indexOf(match) + match.length : line.lastIndexOf(match)); + if (reverse ? offsetA >= pos.ch || offsetA != match.length + : offsetA <= pos.ch || offsetA != line.length - match.length) + return; + for (;;) { + if (reverse ? !ln : ln == lines.length - 1) return; + line = fold(lines[ln += reverse ? -1 : 1].text); + match = target[reverse ? --idx : ++idx]; + if (idx > 0 && idx < target.length - 1) { + if (line != match) return; + else continue; + } + var offsetB = (reverse ? line.lastIndexOf(match) : line.indexOf(match) + match.length); + if (reverse ? offsetB != line.length - match.length : offsetB != match.length) + return; + var start = {line: pos.line, ch: offsetA}, end = {line: ln, ch: offsetB}; + return {from: reverse ? end : start, to: reverse ? start : end}; + } + }; + } + } + + SearchCursor.prototype = { + findNext: function() {return this.find(false);}, + findPrevious: function() {return this.find(true);}, + + find: function(reverse) { + var self = this, pos = clipPos(reverse ? this.pos.from : this.pos.to); + function savePosAndFail(line) { + var pos = {line: line, ch: 0}; + self.pos = {from: pos, to: pos}; + self.atOccurrence = false; + return false; + } + + for (;;) { + if (this.pos = this.matches(reverse, pos)) { + this.atOccurrence = true; + return this.pos.match || true; + } + if (reverse) { + if (!pos.line) return savePosAndFail(0); + pos = {line: pos.line-1, ch: lines[pos.line-1].text.length}; + } + else { + if (pos.line == lines.length - 1) return savePosAndFail(lines.length); + pos = {line: pos.line+1, ch: 0}; + } + } + }, + + from: function() {if (this.atOccurrence) return copyPos(this.pos.from);}, + to: function() {if (this.atOccurrence) return copyPos(this.pos.to);} + }; + + return instance; + } // (end of function CodeMirror) + + // The default configuration options. + CodeMirror.defaults = { + value: "", + mode: null, + indentUnit: 2, + indentWithTabs: false, + tabMode: "classic", + enterMode: "indent", + electricChars: true, + onKeyEvent: null, + lineNumbers: false, + gutter: false, + firstLineNumber: 1, + readOnly: false, + onChange: null, + onCursorActivity: null, + onGutterClick: null, + onFocus: null, onBlur: null, onScroll: null, + matchBrackets: false, + workTime: 100, + workDelay: 200, + undoDepth: 40, + tabindex: null + }; + + // Known modes, by name and by MIME + var modes = {}, mimeModes = {}; + CodeMirror.defineMode = function(name, mode) { + if (!CodeMirror.defaults.mode && name != "null") CodeMirror.defaults.mode = name; + modes[name] = mode; + }; + CodeMirror.defineMIME = function(mime, spec) { + mimeModes[mime] = spec; + }; + CodeMirror.getMode = function(options, spec) { + if (typeof spec == "string" && mimeModes.hasOwnProperty(spec)) + spec = mimeModes[spec]; + if (typeof spec == "string") + var mname = spec, config = {}; + else + var mname = spec.name, config = spec; + var mfactory = modes[mname]; + if (!mfactory) { + if (window.console) console.warn("No mode " + mname + " found, falling back to plain text."); + return CodeMirror.getMode(options, "text/plain"); + } + return mfactory(options, config); + } + CodeMirror.listModes = function() { + var list = []; + for (var m in modes) + if (modes.propertyIsEnumerable(m)) list.push(m); + return list; + }; + CodeMirror.listMIMEs = function() { + var list = []; + for (var m in mimeModes) + if (mimeModes.propertyIsEnumerable(m)) list.push(m); + return list; + }; + + CodeMirror.fromTextArea = function(textarea, options) { + if (!options) options = {}; + options.value = textarea.value; + if (!options.tabindex && textarea.tabindex) + options.tabindex = textarea.tabindex; + + function save() {textarea.value = instance.getValue();} + if (textarea.form) { + // Deplorable hack to make the submit method do the right thing. + var rmSubmit = connect(textarea.form, "submit", save, true); + if (typeof textarea.form.submit == "function") { + var realSubmit = textarea.form.submit; + function wrappedSubmit() { + save(); + textarea.form.submit = realSubmit; + textarea.form.submit(); + textarea.form.submit = wrappedSubmit; + } + textarea.form.submit = wrappedSubmit; + } + } + + textarea.style.display = "none"; + var instance = CodeMirror(function(node) { + textarea.parentNode.insertBefore(node, textarea.nextSibling); + }, options); + instance.save = save; + instance.toTextArea = function() { + save(); + textarea.parentNode.removeChild(instance.getWrapperElement()); + textarea.style.display = ""; + if (textarea.form) { + rmSubmit(); + if (typeof textarea.form.submit == "function") + textarea.form.submit = realSubmit; + } + }; + return instance; + }; + + // Utility functions for working with state. Exported because modes + // sometimes need to do this. + function copyState(mode, state) { + if (state === true) return state; + if (mode.copyState) return mode.copyState(state); + var nstate = {}; + for (var n in state) { + var val = state[n]; + if (val instanceof Array) val = val.concat([]); + nstate[n] = val; + } + return nstate; + } + CodeMirror.startState = startState; + function startState(mode, a1, a2) { + return mode.startState ? mode.startState(a1, a2) : true; + } + CodeMirror.copyState = copyState; + + // The character stream used by a mode's parser. + function StringStream(string) { + this.pos = this.start = 0; + this.string = string; + } + StringStream.prototype = { + eol: function() {return this.pos >= this.string.length;}, + sol: function() {return this.pos == 0;}, + peek: function() {return this.string.charAt(this.pos);}, + next: function() { + if (this.pos < this.string.length) + return this.string.charAt(this.pos++); + }, + eat: function(match) { + var ch = this.string.charAt(this.pos); + if (typeof match == "string") var ok = ch == match; + else var ok = ch && (match.test ? match.test(ch) : match(ch)); + if (ok) {++this.pos; return ch;} + }, + eatWhile: function(match) { + var start = this.start; + while (this.eat(match)){} + return this.pos > start; + }, + eatSpace: function() { + var start = this.pos; + while (/[\s\u00a0]/.test(this.string.charAt(this.pos))) ++this.pos; + return this.pos > start; + }, + skipToEnd: function() {this.pos = this.string.length;}, + skipTo: function(ch) { + var found = this.string.indexOf(ch, this.pos); + if (found > -1) {this.pos = found; return true;} + }, + backUp: function(n) {this.pos -= n;}, + column: function() {return countColumn(this.string, this.start);}, + indentation: function() {return countColumn(this.string);}, + match: function(pattern, consume, caseInsensitive) { + if (typeof pattern == "string") { + function cased(str) {return caseInsensitive ? str.toLowerCase() : str;} + if (cased(this.string).indexOf(cased(pattern), this.pos) == this.pos) { + if (consume !== false) this.pos += pattern.length; + return true; + } + } + else { + var match = this.string.slice(this.pos).match(pattern); + if (match && consume !== false) this.pos += match[0].length; + return match; + } + }, + current: function(){return this.string.slice(this.start, this.pos);} + }; + + // Line objects. These hold state related to a line, including + // highlighting info (the styles array). + function Line(text, styles) { + this.styles = styles || [text, null]; + this.stateAfter = null; + this.text = text; + this.marked = this.gutterMarker = this.className = null; + } + Line.prototype = { + // Replace a piece of a line, keeping the styles around it intact. + replace: function(from, to, text) { + var st = [], mk = this.marked; + copyStyles(0, from, this.styles, st); + if (text) st.push(text, null); + copyStyles(to, this.text.length, this.styles, st); + this.styles = st; + this.text = this.text.slice(0, from) + text + this.text.slice(to); + this.stateAfter = null; + if (mk) { + var diff = text.length - (to - from), end = this.text.length; + function fix(n) {return n <= Math.min(to, to + diff) ? n : n + diff;} + for (var i = 0; i < mk.length; ++i) { + var mark = mk[i], del = false; + if (mark.from >= end) del = true; + else {mark.from = fix(mark.from); if (mark.to != null) mark.to = fix(mark.to);} + if (del || mark.from >= mark.to) {mk.splice(i, 1); i--;} + } + } + }, + // Split a line in two, again keeping styles intact. + split: function(pos, textBefore) { + var st = [textBefore, null]; + copyStyles(pos, this.text.length, this.styles, st); + return new Line(textBefore + this.text.slice(pos), st); + }, + addMark: function(from, to, style) { + var mk = this.marked, mark = {from: from, to: to, style: style}; + if (this.marked == null) this.marked = []; + this.marked.push(mark); + this.marked.sort(function(a, b){return a.from - b.from;}); + return mark; + }, + removeMark: function(mark) { + var mk = this.marked; + if (!mk) return; + for (var i = 0; i < mk.length; ++i) + if (mk[i] == mark) {mk.splice(i, 1); break;} + }, + // Run the given mode's parser over a line, update the styles + // array, which contains alternating fragments of text and CSS + // classes. + highlight: function(mode, state) { + var stream = new StringStream(this.text), st = this.styles, pos = 0, changed = false; + while (!stream.eol()) { + var style = mode.token(stream, state); + var substr = this.text.slice(stream.start, stream.pos); + stream.start = stream.pos; + if (pos && st[pos-1] == style) + st[pos-2] += substr; + else if (substr) { + if (!changed && st[pos] != substr || st[pos+1] != style) changed = true; + st[pos++] = substr; st[pos++] = style; + } + // Give up when line is ridiculously long + if (stream.pos > 5000) { + st[pos++] = this.text.slice(stream.pos); st[pos++] = null; + break; + } + } + if (st.length != pos) {st.length = pos; changed = true;} + return changed; + }, + // Fetch the parser token for a given character. Useful for hacks + // that want to inspect the mode state (say, for completion). + getTokenAt: function(mode, state, ch) { + var txt = this.text, stream = new StringStream(txt); + while (stream.pos < ch && !stream.eol()) { + stream.start = stream.pos; + var style = mode.token(stream, state); + } + return {start: stream.start, + end: stream.pos, + string: stream.current(), + className: style || null, + state: state}; + }, + indentation: function() {return countColumn(this.text);}, + // Produces an HTML fragment for the line, taking selection, + // marking, and highlighting into account. + getHTML: function(sfrom, sto, includePre) { + var html = []; + if (includePre) + html.push(this.className ? '<pre class="' + this.className + '">': "<pre>"); + function span(text, style) { + if (!text) return; + if (style) html.push('<span class="', style, '">', htmlEscape(text), "</span>"); + else html.push(htmlEscape(text)); + } + var st = this.styles, allText = this.text, marked = this.marked; + if (sfrom == sto) sfrom = null; + + if (!allText) + span(" ", sfrom != null && sto == null ? "CodeMirror-selected" : null); + else if (!marked && sfrom == null) + for (var i = 0, e = st.length; i < e; i+=2) span(st[i], st[i+1]); + else { + var pos = 0, i = 0, text = "", style, sg = 0; + var markpos = -1, mark = null; + function nextMark() { + if (marked) { + markpos += 1; + mark = (markpos < marked.length) ? marked[markpos] : null; + } + } + nextMark(); + while (pos < allText.length) { + var upto = allText.length; + var extraStyle = ""; + if (sfrom != null) { + if (sfrom > pos) upto = sfrom; + else if (sto == null || sto > pos) { + extraStyle = " CodeMirror-selected"; + if (sto != null) upto = Math.min(upto, sto); + } + } + while (mark && mark.to != null && mark.to <= pos) nextMark(); + if (mark) { + if (mark.from > pos) upto = Math.min(upto, mark.from); + else { + extraStyle += " " + mark.style; + if (mark.to != null) upto = Math.min(upto, mark.to); + } + } + for (;;) { + var end = pos + text.length; + var apliedStyle = style; + if (extraStyle) apliedStyle = style ? style + extraStyle : extraStyle; + span(end > upto ? text.slice(0, upto - pos) : text, apliedStyle); + if (end >= upto) {text = text.slice(upto - pos); pos = upto; break;} + pos = end; + text = st[i++]; style = st[i++]; + } + } + if (sfrom != null && sto == null) span(" ", "CodeMirror-selected"); + } + if (includePre) html.push("</pre>"); + return html.join(""); + } + }; + // Utility used by replace and split above + function copyStyles(from, to, source, dest) { + for (var i = 0, pos = 0, state = 0; pos < to; i+=2) { + var part = source[i], end = pos + part.length; + if (state == 0) { + if (end > from) dest.push(part.slice(from - pos, Math.min(part.length, to - pos)), source[i+1]); + if (end >= from) state = 1; + } + else if (state == 1) { + if (end > to) dest.push(part.slice(0, to - pos), source[i+1]); + else dest.push(part, source[i+1]); + } + pos = end; + } + } + + // The history object 'chunks' changes that are made close together + // and at almost the same time into bigger undoable units. + function History() { + this.time = 0; + this.done = []; this.undone = []; + } + History.prototype = { + addChange: function(start, added, old) { + this.undone.length = 0; + var time = +new Date, last = this.done[this.done.length - 1]; + if (time - this.time > 400 || !last || + last.start > start + added || last.start + last.added < start - last.added + last.old.length) + this.done.push({start: start, added: added, old: old}); + else { + var oldoff = 0; + if (start < last.start) { + for (var i = last.start - start - 1; i >= 0; --i) + last.old.unshift(old[i]); + last.added += last.start - start; + last.start = start; + } + else if (last.start < start) { + oldoff = start - last.start; + added += oldoff; + } + for (var i = last.added - oldoff, e = old.length; i < e; ++i) + last.old.push(old[i]); + if (last.added < added) last.added = added; + } + this.time = time; + } + }; + + // Event stopping compatibility wrapper. + function stopEvent() { + if (this.preventDefault) {this.preventDefault(); this.stopPropagation();} + else {this.returnValue = false; this.cancelBubble = true;} + } + // Ensure an event has a stop method. + function addStop(event) { + if (!event.stop) event.stop = stopEvent; + return event; + } + + // Event wrapper, exposing the few operations we need. + function Event(orig) {this.e = orig;} + Event.prototype = { + stop: function() {stopEvent.call(this.e);}, + target: function() {return this.e.target || this.e.srcElement;}, + button: function() { + if (this.e.which) return this.e.which; + else if (this.e.button & 1) return 1; + else if (this.e.button & 2) return 3; + else if (this.e.button & 4) return 2; + }, + pageX: function() { + if (this.e.pageX != null) return this.e.pageX; + else return this.e.clientX + document.body.scrollLeft + document.documentElement.scrollLeft; + }, + pageY: function() { + if (this.e.pageY != null) return this.e.pageY; + else return this.e.clientY + document.body.scrollTop + document.documentElement.scrollTop; + } + }; + + // Event handler registration. If disconnect is true, it'll return a + // function that unregisters the handler. + function connect(node, type, handler, disconnect) { + function wrapHandler(event) {handler(new Event(event || window.event));} + if (typeof node.addEventListener == "function") { + node.addEventListener(type, wrapHandler, false); + if (disconnect) return function() {node.removeEventListener(type, wrapHandler, false);}; + } + else { + node.attachEvent("on" + type, wrapHandler); + if (disconnect) return function() {node.detachEvent("on" + type, wrapHandler);}; + } + } + + function Delayed() {this.id = null;} + Delayed.prototype = {set: function(ms, f) {clearTimeout(this.id); this.id = setTimeout(f, ms);}}; + + // Some IE versions don't preserve whitespace when setting the + // innerHTML of a PRE tag. + var badInnerHTML = (function() { + var pre = document.createElement("pre"); + pre.innerHTML = " "; return !pre.innerHTML; + })(); + + var gecko = /gecko\/\d{7}/i.test(navigator.userAgent); + + var lineSep = "\n"; + // Feature-detect whether newlines in textareas are converted to \r\n + (function () { + var te = document.createElement("textarea"); + te.value = "foo\nbar"; + if (te.value.indexOf("\r") > -1) lineSep = "\r\n"; + }()); + + var tabSize = 8; + var mac = /Mac/.test(navigator.platform); + var movementKeys = {}; + for (var i = 35; i <= 40; ++i) + movementKeys[i] = movementKeys["c" + i] = true; + + // Counts the column offset in a string, taking tabs into account. + // Used mostly to find indentation. + function countColumn(string, end) { + if (end == null) { + end = string.search(/[^\s\u00a0]/); + if (end == -1) end = string.length; + } + for (var i = 0, n = 0; i < end; ++i) { + if (string.charAt(i) == "\t") n += tabSize - (n % tabSize); + else ++n; + } + return n; + } + + // Find the position of an element by following the offsetParent chain. + function eltOffset(node) { + var x = 0, y = 0, n2 = node; + for (var n = node; n; n = n.offsetParent) {x += n.offsetLeft; y += n.offsetTop;} + for (var n = node; n != document.body; n = n.parentNode) {x -= n.scrollLeft; y -= n.scrollTop;} + return {left: x, top: y}; + } + // Get a node's text content. + function eltText(node) { + return node.textContent || node.innerText || node.nodeValue || ""; + } + + // Operations on {line, ch} objects. + function posEq(a, b) {return a.line == b.line && a.ch == b.ch;} + function posLess(a, b) {return a.line < b.line || (a.line == b.line && a.ch < b.ch);} + function copyPos(x) {return {line: x.line, ch: x.ch};} + + function htmlEscape(str) { + return str.replace(/[<&]/g, function(str) {return str == "&" ? "&" : "<";}); + } + + // Used to position the cursor after an undo/redo by finding the + // last edited character. + function editEnd(from, to) { + if (!to) return from ? from.length : 0; + if (!from) return to.length; + for (var i = from.length, j = to.length; i >= 0 && j >= 0; --i, --j) + if (from.charAt(i) != to.charAt(j)) break; + return j + 1; + } + + function indexOf(collection, elt) { + if (collection.indexOf) return collection.indexOf(elt); + for (var i = 0, e = collection.length; i < e; ++i) + if (collection[i] == elt) return i; + return -1; + } + + // See if "".split is the broken IE version, if so, provide an + // alternative way to split lines. + if ("\n\nb".split(/\n/).length != 3) + var splitLines = function(string) { + var pos = 0, nl, result = []; + while ((nl = string.indexOf("\n", pos)) > -1) { + result.push(string.slice(pos, string.charAt(nl-1) == "\r" ? nl - 1 : nl)); + pos = nl + 1; + } + result.push(string.slice(pos)); + return result; + }; + else + var splitLines = function(string){return string.split(/\r?\n/);}; + + // Sane model of finding and setting the selection in a textarea + if (window.getSelection) { + var selRange = function(te) { + try {return {start: te.selectionStart, end: te.selectionEnd};} + catch(e) {return null;} + }; + var setSelRange = function(te, start, end) { + try {te.setSelectionRange(start, end);} + catch(e) {} // Fails on Firefox when textarea isn't part of the document + }; + } + // IE model. Don't ask. + else { + var selRange = function(te) { + try {var range = document.selection.createRange();} + catch(e) {return null;} + if (!range || range.parentElement() != te) return null; + var val = te.value, len = val.length, localRange = te.createTextRange(); + localRange.moveToBookmark(range.getBookmark()); + var endRange = te.createTextRange(); + endRange.collapse(false); + + if (localRange.compareEndPoints("StartToEnd", endRange) > -1) + return {start: len, end: len}; + + var start = -localRange.moveStart("character", -len); + for (var i = val.indexOf("\r"); i > -1 && i < start; i = val.indexOf("\r", i+1), start++) {} + + if (localRange.compareEndPoints("EndToEnd", endRange) > -1) + return {start: start, end: len}; + + var end = -localRange.moveEnd("character", -len); + for (var i = val.indexOf("\r"); i > -1 && i < end; i = val.indexOf("\r", i+1), end++) {} + return {start: start, end: end}; + }; + var setSelRange = function(te, start, end) { + var range = te.createTextRange(); + range.collapse(true); + var endrange = range.duplicate(); + var newlines = 0, txt = te.value; + for (var pos = txt.indexOf("\n"); pos > -1 && pos < start; pos = txt.indexOf("\n", pos + 1)) + ++newlines; + range.move("character", start - newlines); + for (; pos > -1 && pos < end; pos = txt.indexOf("\n", pos + 1)) + ++newlines; + endrange.move("character", end - newlines); + range.setEndPoint("EndToEnd", endrange); + range.select(); + }; + } + + CodeMirror.defineMode("null", function() { + return {token: function(stream) {stream.skipToEnd();}}; + }); + CodeMirror.defineMIME("text/plain", "null"); + + return CodeMirror; +})(); Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/lib/overlay.js =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/lib/overlay.js (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/lib/overlay.js 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,51 @@ +// Utility function that allows modes to be combined. The mode given +// as the base argument takes care of most of the normal mode +// functionality, but a second (typically simple) mode is used, which +// can override the style of text. Both modes get to parse all of the +// text, but when both assign a non-null style to a piece of code, the +// overlay wins, unless the combine argument was true, in which case +// the styles are combined. + +CodeMirror.overlayParser = function(base, overlay, combine) { + return { + startState: function() { + return { + base: CodeMirror.startState(base), + overlay: CodeMirror.startState(overlay), + basePos: 0, baseCur: null, + overlayPos: 0, overlayCur: null + }; + }, + copyState: function(state) { + return { + base: CodeMirror.copyState(base, state.base), + overlay: CodeMirror.copyState(overlay, state.overlay), + basePos: state.basePos, baseCur: null, + overlayPos: state.overlayPos, overlayCur: null + }; + }, + + token: function(stream, state) { + if (stream.start == state.basePos) { + state.baseCur = base.token(stream, state.base); + state.basePos = stream.pos; + } + if (stream.start == state.overlayPos) { + stream.pos = stream.start; + state.overlayCur = overlay.token(stream, state.overlay); + state.overlayPos = stream.pos; + } + stream.pos = Math.min(state.basePos, state.overlayPos); + if (stream.eol()) state.basePos = state.overlayPos = 0; + + if (state.overlayCur == null) return state.baseCur; + if (state.baseCur != null && combine) return state.baseCur + " " + state.overlayCur; + else return state.overlayCur; + }, + + indent: function(state, textAfter) { + return base.indent(state.base, textAfter); + }, + electricChars: base.electricChars + }; +}; Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/manual.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/manual.html (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/manual.html 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,771 @@ +<!doctype html> +<html> + <head> + <title>CodeMirror: User Manual</title> + <link rel="stylesheet" type="text/css" href="css/docs.css"/> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> + <style>dl dl {margin: 0;}</style> + </head> + <body> + +<h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMirror</a></h1> + +<pre class="grey"> +<img src="css/baboon.png" class="logo" alt="logo"/>/* User manual and + reference guide */ +</pre> + +<div class="clear"><div class="leftbig blk"> + + <h2 id="overview">Overview</h2> + + <p>CodeMirror is a code-editor component that can be embedded in + Web pages. It provides <em>only</em> the editor component, no + accompanying buttons, auto-completion, or other IDE functionality. + It does provide a rich API on top of which such functionality can + be straightforwardly implemented.</p> + + <p>CodeMirror works with language-specific modes. Modes are + JavaScript programs that help color (and optionally indent) text + written in a given language. The distribution comes with a few + modes (see the <code>mode/</code> directory), and it isn't hard + to <a href="#modeapi">write new ones</a> for other languages.</p> + + <h2 id="usage">Basic Usage</h2> + + <p>The easiest way to use CodeMirror is to simply load the script + and style sheet found under <code>lib/</code> in the distribution, + plus the script and style sheet for the mode(s) you want to use. + (See also <a href="compress.html">the compresion helper</a>.) For + example:</p> + + <pre><script src="lib/codemirror.js"></script> +<link rel="stylesheet" href="lib/codemirror.css"> +<script src="mode/javascript/javascript.js"></script> +<link rel="stylesheet" href="mode/javascript/javascript.css"></pre> + + <p>Having done this, an editor instance can be created like + this:</p> + + <pre>var myCodeMirror = CodeMirror(document.body);</pre> + + <p>The editor will be appended to the document body, will start + empty, and will use the mode that we loaded. To have more control + over the new editor, a configuration object can be passed + to <code>CodeMirror</code> as a second argument:</p> + + <pre>var myCodeMirror = CodeMirror(document.body, { + value: "function myScript(){return 100;}\n", + mode: "javascript" +});</pre> + + <p>This will initialize the editor with a piece of code already in + it, and explicitly tell it to use the JavaScript mode (which is + useful when multiple modes are loaded). + See <a href="#config">below</a> for a full discussion of the + configuration options that CodeMirror accepts.</p> + + <p>In cases where you don't want to append the editor to an + element, and need more control over the way it is inserted, the + first argument to the <code>CodeMirror</code> function can also + be a function that, when given a DOM element, inserts it into the + document somewhere. This could be used to, for example, replace a + textarea with a real editor:</p> + + <pre>var myCodeMirror = CodeMirror(function(elt) { + myTextArea.parentNode.replaceChild(myTextArea, elt); +}, {value: myTextArea.value});</pre> + + <p>However, for this use case, which is a common way to use + CodeMirror, the library provides a much more powerful + shortcut:</p> + + <pre>var myCodeMirror = CodeMirror.fromTextArea(myTextArea);</pre> + + <p>This will, among other things, ensure that the textarea's value + is updated when the form (if it is part of a form) is submitted. + See the <a href="#fromTextArea">API reference</a> for a full + description of this method.</p> + + <h2 id="config">Configuration</h2> + + <p>Both the <code>CodeMirror</code> function and + its <code>fromTextArea</code> method take as second (optional) + argument an object containing configuration options. Any option + not supplied like this will be taken + from <code>CodeMirror.defaults</code>, an object containing the + default options. You can update this object to change the defaults + on your page.</p> + + <p>Options are not checked in any way, so setting bogus options is + bound to lead to odd errors.</p> + + <p>These are the supported options:</p> + + <dl> + <dt id="option_value"><code>value (string)</code></dt> + <dd>The starting value of the editor.</dd> + + <dt id="option_mode"><code>mode (string or object)</code></dt> + <dd>The mode to use. When not given, this will default to the + first mode that was loaded. It may be a string, which either + simply names the mode or is + a <a href="http://en.wikipedia.org/wiki/MIME">MIME</a> type + associated with the mode. Alternatively, it may be an object + containing configuration options for the mode, with + a <code>name</code> property that names the mode (for + example <code>{name: "javascript", json: true}</code>). The demo + pages for each mode contain information about what configuration + parameters the mode supports. You can ask CodeMirror which modes + and MIME types are loaded with + the <code>CodeMirror.listModes</code> + and <code>CodeMirror.listMIMEs</code> functions.</dd> + + <dt id="option_indentUnit"><code>indentUnit (integer)</code></dt> + <dd>How many spaces a block (whatever that means in the edited + language) should be indented. The default is 2.</dd> + + <dt id="option_indentWithTabs"><code>indentWithTabs (boolean)</code></dt> + <dd>Whether, when indenting, the first N*8 spaces should be + replaced by N tabs. Default is false.</dd> + + <dt id="option_tabMode"><code>tabMode (string)</code></dt> + <dd>Determines what happens when the user presses the tab key. + Must be one of the following: + <dl> + <dt><code>"classic" (the default)</code></dt> + <dd>When nothing is selected, insert a tab. Otherwise, + behave like the <code>"shift"</code> mode. (When shift is + held, this behaves like the <code>"indent"</code> mode.)</dd> + <dt><code>"shift"</code></dt> + <dd>Indent all selected lines by + one <a href="#option_indentUnit"><code>indentUnit</code></a>. + If shift was held while pressing tab, un-indent all selected + lines one unit.</dd> + <dt><code>"indent"</code></dt> + <dd>Indent the line the 'correctly', based on its syntactic + context. Only works if the + mode <a href="#indent">supports</a> it.</dd> + <dt><code>"default"</code></dt> + <dd>Do not capture tab presses, let the browser apply its + default behaviour (which usually means it skips to the next + control).</dd> + </dl></dd> + + <dt id="option_enterMode"><code>enterMode (string)</code></dt> + <dd>Determines whether and how new lines are indented when the + enter key is pressed. The following modes are supported: + <dl> + <dt><code>"indent" (the default)</code></dt> + <dd>Use the mode's indentation rules to give the new line + the correct indentation.</dd> + <dt><code>"keep"</code></dt> + <dd>Indent the line the same as the previous line.</dd> + <dt><code>"flat"</code></dt> + <dd>Do not indent the new line.</dd> + </dl></dd> + + <dt id="option_electricChars"><code>electricChars (boolean)</code></dt> + <dd>Configures whether the editor should re-indent the current + line when a character is typed that might change its proper + indentation (only works if the mode supports indentation). + Default is true.</dd> + + <dt id="option_lineNumbers"><code>lineNumbers (boolean)</code></dt> + <dd>Whether to show line numbers to the left of the editor.</dd> + + <dt id="option_firstLineNumber"><code>firstLineNumber (integer)</code></dt> + <dd>At which number to start counting lines. Default is 1.</dd> + + <dt id="option_gutter"><code>gutter (boolean)</code></dt> + <dd>Can be used to force a 'gutter' (empty space on the left of + the editor) to be shown even when no line numbers are active. + This is useful for setting <a href="#setMarker">markers</a>.</dd> + + <dt id="option_readOnly"><code>readOnly (boolean)</code></dt> + <dd>This disables editing of the editor content by the user. + (Changes through API functions will still be possible.)</dd> + + <dt id="option_onChange"><code>onChange (function)</code></dt> + <dd>When given, this function will be called every time the + content of the editor is changed. It will be given the editor + instance as only argument.</dd> + + <dt id="option_onCursorActivity"><code>onCursorActivity (function)</code></dt> + <dd>Like <code>onChange</code>, but will also be called when the + cursor moves without any changes being made.</dd> + + <dt id="option_onGutterClick"><code>onGutterClick (function)</code></dt> + <dd>When given, will be called whenever the editor gutter (the + line-number area) is clicked. Will be given the editor instance + as first argument, and the (zero-based) number of the line that + was clicked as second argument.</dd> + + <dt id="option_onFocus"><code>onFocus, onBlur (function)</code></dt> + <dd>The given functions will be called whenever the editor is + focused or unfocused.</dd> + + <dt id="option_onScroll"><code>onScroll (function)</code></dt> + <dd>When given, will be called whenever the editor is + scrolled.</dd> + + <dt id="option_matchBrackets"><code>matchBrackets (boolean)</code></dt> + <dd>Determines whether brackets are matched whenever the cursor + is moved next to a bracket.</dd> + + <dt id="option_workTime"><code>workTime, workDelay (number)</code></dt> + <dd>Highlighting is done by a pseudo background-thread that will + work for <code>workTime</code> milliseconds, and then use + timeout to sleep for <code>workDelay</code> milliseconds. The + defaults are 200 and 300, you can change these options to make + the highlighting more or less aggressive.</dd> + + <dt id="option_undoDepth"><code>undoDepth (integer)</code></dt> + <dd>The maximum number of undo levels that the editor stores. + Defaults to 40.</dd> + + <dt id="option_tabindex"><code>tabindex (integer)</code></dt> + <dd>The <a href="http://www.w3.org/TR/html401/interact/forms.html#adef-tabindex">tab + index</a> to assign to the editor. If not given, no tab index + will be assigned.</dd> + + <dt id="option_onKeyEvent"><code>onKeyEvent (function)</code></dt> + <dd>This provides a rather low-level hook into CodeMirror's key + handling. If provided, this function will be called on + every <code>keydown</code> and <code>keypress</code> event that + CodeMirror captures. It will be passed two arguments, the editor + instance and the key event. This key event is pretty much the + raw key event, except that a <code>stop()</code> method is + always added to it. You could feed it to, for + example, <code>jQuery.Event</code> to further normalize + it.<br>This function can inspect the key event, and handle it if + it wants to. It may return true to tell CodeMirror to ignore the + event. Be wary that, on some browsers, stopping + a <code>keydown</code> does not stop the <code>keypress</code> + from firing, whereas on others it does. If you respond to an + event, you should probably inspect its <code>type</code> + property and only do something when it is <code>keydown</code> + (or <code>keypress</code> for actions that need character + data).</dd> + </dl> + + <h2 id="styling">Customized Styling</h2> + + <p>Up to a certain extent, CodeMirror's look can be changed by + modifying style sheet files. The style sheets supplied by modes + simply provide the colors for that mode, and can be adapted in a + very straightforward way. To style the editor itself, it is + possible to alter or override the styles defined + in <a href="lib/codemirror.css"><code>codemirror.css</code></a>.</p> + + <p>Some care must be taken there, since a lot of the rules in this + file are necessary to have CodeMirror function properly. Adjusting + colors should be safe, of course, and with some care a lot of + other things can be changed as well. The CSS classes defined in + this file serve the following roles:</p> + + <dl> + <dt id="class_CodeMirror"><code>CodeMirror</code></dt> + <dd>The outer element of the editor. This determines whether the + editor scrolls (<code>overflow: auto</code> + fixed height). Can + also be used to set styles that should hold for everything + inside the editor, or to set a background.</dd> + + <dt id="class_CodeMirror_focused"><code>CodeMirror-focused</code></dt> + <dd>Whenever the editor is focused, the top element gets this + class. This is used to hide the cursor and give the selection a + different color when the editor is not focused.</dd> + + <dt id="class_CodeMirror_gutter"><code>CodeMirror-gutter</code></dt> + <dd>Use this for giving a background or a border to the editor + gutter. Don't set any padding here, + use <code>CodeMirror-gutter-text</code> for that. By default, + the gutter is 'fluid', meaning it will adjust its width to the + maximum line number or line marker width. You can also set a + fixed width if you want.</dd> + + <dt id="class_CodeMirror_gutter_text"><code>CodeMirror-gutter-text</code></dt> + <dd>Used to style the actual line numbers. For the numbers to + line up, you'll want this style to use exactly the same font and + vertical padding as normal edited text, as per + the <code>CodeMirror-lines</code> class.</dd> + + <dt id="class_CodeMirror_lines"><code>CodeMirror-lines</code></dt> + <dd>The visible lines. If this has vertical + padding, <code>CodeMirror-gutter</code> should have the same + padding.</dd> + + <dt id="class_CodeMirror_cursor"><code>CodeMirror-cursor</code></dt> + <dd>The cursor is a block element that is absolutely positioned. + You can make it look whichever way you want.</dd> + + <dt id="class_CodeMirror_selected"><code>CodeMirror-selected</code></dt> + <dd>The selection is represented by <code>span</code> elements + with this class.</dd> + + <dt id="class_CodeMirror_matchingbracket"><code>CodeMirror-matchingbracket</code>, + <code>CodeMirror-matchingbracket</code></dt> + <dd>These are used to style matched (or unmatched) brackets.</dd> + </dl> + + <p>The actual lines, as well as the cursor, are represented + by <code>pre</code> elements. By default no text styling (such as + bold) that might change line height is applied. If you do want + such effects, you'll have to give <code>CodeMirror pre</code> a + fixed height. Also, you must still take care that character width + is constant.</p> + + <p>If your page's style sheets do funky things to + all <code>div</code> or <code>pre</code> elements (you probably + shouldn't do that), you'll have to define rules to cancel these + effects out again for elements under the <code>CodeMirror</code> + class.</p> + + <h2 id="api">Programming API</h2> + + <p>A lot of CodeMirror features are only available through its API. + This has the disadvantage that you need to do work to enable them, + and the advantage that CodeMirror will fit seamlessly into your + application.</p> + + <p>Whenever points in the document are represented, the API uses + objects with <code>line</code> and <code>ch</code> properties. + Both are zero-based. CodeMirror makes sure to 'clip' any positions + passed by client code so that they fit inside the document, so you + shouldn't worry too much about sanitizing your coordinates. If you + give <code>ch</code> a value of <code>null</code>, or don't + specify it, it will be replaced with the length of the specified + line.</p> + + <dl> + <dt id="getValue"><code>getValue() → string</code></dt> + <dd>Get the current editor content.</dd> + <dt id="setValue"><code>setValue(string)</code></dt> + <dd>Set the editor content.</dd> + + <dt id="getSelection"><code>getSelection() → string</code></dt> + <dd>Get the currently selected code.</dd> + <dt id="replaceSelection"><code>replaceSelection(string)</code></dt> + <dd>Replace the selection with the given string.</dd> + + <dt id="focus"><code>focus()</code></dt> + <dd>Give the editor focus.</dd> + + <dt id="setOption"><code>setOption(option, value)</code></dt> + <dd>Change the configuration of the editor. <code>option</code> + should the name of an <a href="#config">option</a>, + and <code>value</code> should be a valid value for that + option.</dd> + <dt id="getOption"><code>getOption(option) → value</code></dt> + <dd>Retrieves the current value of the given option for this + editor instance.</dd> + + <dt id="cursorCoords"><code>cursorCoords(start) → object</code></dt> + <dd>Returns an <code>{x, y, yBot}</code> object containing the + coordinates of the cursor relative to the top-left corner of the + page. <code>yBot</code> is the coordinate of the bottom of the + cursor. <code>start</code> is a boolean indicating whether you + want the start or the end of the selection.</dd> + <dt id="charCoords"><code>charCoords(pos) → object</code></dt> + <dd>Like <code>cursorCoords</code>, but returns the position of + an arbitrary characters. <code>pos</code> should be + a <code>{line, ch}</code> object.</dd> + <dt id="coordsChar"><code>coordsChar(object) → pos</code></dt> + <dd>Given an <code>{x, y}</code> object (in page coordinates), + returns the <code>{line, ch}</code> position that corresponds to + it.</dd> + + <dt id="undo"><code>undo()</code></dt> + <dd>Undo one edit (if any undo events are stored).</dd> + <dt id="redo"><code>redo()</code></dt> + <dd>Redo one undone edit.</dd> + <dt id="historySize"><code>historySize() → object</code></dt> + <dd>Returns an object with <code>{undo, redo}</code> properties, + both of which hold integers, indicating the amount of stored + undo and redo operations.</dd> + + <dt id="indentLine"><code>indentLine(line)</code></dt> + <dd>Reset the given line's indentation to the indentation + prescribed by the mode.</dd> + + <dt id="getSearchCursor"><code>getSearchCursor(query, start, caseFold) → cursor</code></dt> + <dd>Used to implement search/replace + functionality. <code>query</code> can be a regular expression or + a string (only strings will match across lines—if they contain + newlines). <code>start</code> provides the starting position of + the search. It can be a <code>{line, ch}</code> object, or can + be left off to default to the start of the + document. <code>caseFold</code> is only relevant when matching a + string. It will cause the search to be case-insensitive. A + search cursor has the following methods: + <dl> + <dt><code>findNext(), findPrevious() → boolean</code></dt> + <dd>Search forward or backward from the current position. + The return value indicates whether a match was found. If + matching a regular expression, the return value will be the + array returned by the <code>match</code> method, in case you + want to extract matched groups.</dd> + <dt><code>from(), to() → object</code></dt> + <dd>These are only valid when the last call + to <code>findNext</code> or <code>findPrevious</code> did + not return false. They will return <code>{line, ch}</code> + objects pointing at the start and end of the match.</dd> + </dl></dd> + + <dt id="getTokenAt"><code>getTokenAt(pos) → object</code></dt> + <dd>Retrieves information about the token the current mode found + at the given position (a <code>{line, ch}</code> object). The + returned object has the following properties: + <dl> + <dt><code>start</code></dt><dd>The character (on the given line) at which the token starts.</dd> + <dt><code>end</code></dt><dd>The character at which the token ends.</dd> + <dt><code>string</code></dt><dd>The token's string.</dd> + <dt><code>className</code></dt><dd>The class the mode assigned + to the token. (Can be null when no class was assigned.)</dd> + </dl></dd> + + <dt id="markText"><code>markText(from, to, className) → function</code></dt> + <dd>Can be used to mark a range of text with a specific CSS + class name. <code>from</code> and <code>to</code> should + be <code>{line, ch}</code> objects. The method will return a + function that can be called to remove the marking.</dd> + + <dt id="setMarker"><code>setMarker(line, text, className) → lineHandle</code></dt> + <dd>Add a gutter marker for the given line. Gutter markers are + shown in the line-number area (instead of the number for this + line). Both <code>text</code> and <code>className</code> are + optional. Setting <code>text</code> to a Unicode character like + ● tends to give a nice effect. To put a picture in the gutter, + set <code>text</code> to a space and <code>className</code> to + something that sets a background image. If you + specify <code>text</code>, the given text (which may contain + HTML) will, by default, replace the line number for that line. + If this is not what you want, you can include the + string <code>%N%</code> in the text, which will be replaced by + the line number.</dd> + <dt id="clearMarker"><code>clearMarker(line)</code></dt> + <dd>Clears a marker created + with <code>setMarker</code>. <code>line</code> can be either a + number or a handle returned by <code>setMarker</code> (since a + number may now refer to a different line if something was added + or deleted).</dd> + <dt id="setLineClass"><code>setLineClass(line, className) → lineHandle</code></dt> + <dd>Set a CSS class name for the given line. <code>line</code> + can be a number or a line handle (as returned + by <code>setMarker</code> or this function). + Pass <code>null</code> to clear the class for a line.</dd> + + <dt id="lineInfo"><code>lineInfo(line) → object</code></dt> + <dd>Returns the line number, text content, and marker status of + the given line, which can be either a number or a handle + returned by <code>setMarker</code>. The returned object has the + structure <code>{line, text, markerText, markerClass}</code>.</dd> + + <dt id="addWidget"><code>addWidget(pos, node, scrollIntoView)</code></dt> + <dd>Puts <code>node</code>, which should be an absolutely + positioned DOM node, into the editor, positioned right below the + given <code>{line, ch}</code> position. + When <code>scrollIntoView</code> is true, the editor will ensure + that the entire node is visible (if possible). To remove the + widget again, simply use DOM methods (move it somewhere else, or + call <code>removeChild</code> on its parent).</dd> + + <dt id="matchBrackets"><code>matchBrackets()</code></dt> + <dd>Force matching-bracket-highlighting to happen.</dd> + + <dt id="lineCount"><code>lineCount() → number</code></dt> + <dd>Get the number of lines in the editor.</dd> + + <dt id="getCursor"><code>getCursor(start) → object</code></dt> + <dd><code>start</code> is a boolean indicating whether the start + or the end of the selection must be retrieved. If it is not + given, the current cursor pos, i.e. the side of the selection + that would move if you pressed an arrow key, is chosen. + A <code>{line, ch}</code> object will be returned.</dd> + <dt id="somethingSelected"><code>somethingSelected() → boolean</code></dt> + <dd>Return true if any text is selected.</dd> + <dt id="setCursor"><code>setCursor(pos)</code></dt> + <dd>Set the cursor position. You can either pass a + single <code>{line, ch}</code> object, or the line and the + character as two separate parameters.</dd> + <dt id="setSelection"><code>setSelection(start, end)</code></dt> + <dd>Set the selection range. <code>start</code> + and <code>end</code> should be <code>{line, ch}</code> objects.</dd> + + <dt id="getLine"><code>getLine(n) → string</code></dt> + <dd>Get the content of line <code>n</code>.</dd> + <dt id="setLine"><code>setLine(n, text)</code></dt> + <dd>Set the content of line <code>n</code>.</dd> + <dt id="removeLine"><code>removeLine(n)</code></dt> + <dd>Remove the given line from the document.</dd> + + <dt id="getRange"><code>getRange(from, to) → string</code></td> + <dd>Get the text between the given points in the editor, which + should be <code>{line, ch}</code> objects.</dd> + <dt id="replaceRange"><code>replaceRange(string, from, to)</code></dt> + <dd>Replace the part of the document between <code>from</code> + and <code>to</code> with the given string. <code>from</code> + and <code>to</code> must be <code>{line, ch}</code> + objects. <code>to</code> can be left off to simply insert the + string at position <code>from</code>.</dd> + </dl> + + <p>The following are more low-level methods:</p> + + <dl> + <dt id="operation"><code>operation(func) → result</code></dt> + <dd>CodeMirror internally buffers changes and only updates its + DOM structure after it has finished performing some operation. + If you need to perform a lot of operations on a CodeMirror + instance, you can call this method with a function argument. It + will call the function, buffering up all changes, and only doing + the expensive update after the function returns. This can be a + lot faster. The return value from this method will be the return + value of your function.</dd> + + <dt id="refresh"><code>refresh()</code></dt> + <dd>If your code does something to change the size of the editor + element (window resizes are already listened for), or unhides + it, you should probably follow up by calling this method to + ensure CodeMirror is still looking as intended.</dd> + + <dt id="getInputField"><code>getInputField() → textarea</code></dt> + <dd>Returns the hiden textarea used to read input.</dd> + <dt id="getWrapperElement"><code>getWrapperElement() → node</code></dt> + <dd>Returns the DOM node that represents the editor. Remove this + from your tree to delete an editor instance.</dd> + </dl> + + <p id="fromTextArea">Finally, the <code>CodeMirror</code> object + itself has a method <code>fromTextArea</code>. This takes a + textarea DOM node as first argument and an optional configuration + object as second. It will replace the textarea with a CodeMirror + instance, and wire up the form of that textarea (if any) to make + sure the editor contents are put into the textarea when the form + is submitted. A CodeMirror instance created this way has two + additional methods:</p> + + <dl> + <dt id="save"><code>save()</code></dt> + <dd>Copy the content of the editor into the textarea.</dd> + + <dt id="toTextArea"><code>toTextArea()</code></dt> + <dd>Remove the editor, and restore the original textarea (with + the editor's current content).</dd> + </dl> + + <h2 id="modeapi">Writing CodeMirror Modes</h2> + + <p>Modes typically consist of a JavaScript file and a CSS file. + The CSS file (see, for + example <a href="mode/javascript/javascript.css"><code>javascript.css</code></a>) + defines the classes that will be used to style the syntactic + elements of the code, and the script contains the logic to + actually assign these classes to the right pieces of text.</p> + + <p>You'll usually want to use some kind of prefix for your CSS + classes, so that they are unlikely to clash with other classes, + both those used by other modes and those defined by the page in + which CodeMirror is embedded.</p> + + <p id="defineMode">The mode script should + call <code>CodeMirror.defineMode</code> to register itself with + CodeMirror. This function takes two arguments. The first should be + the name of the mode, for which you should use a lowercase string, + preferably one that is also the name of the files that define the + mode (i.e. <code>"xml"</code> is defined <code>xml.js</code>). The + second argument should be a function that, given a CodeMirror + configuration object (the thing passed to + the <code>CodeMirror</code> function) and a mode configuration + object (as in the <a href="#option_mode"><code>mode</code></a> + option), returns a mode object.</p> + + <p>Typically, you should use this second argument + to <code>defineMode</code> as your module scope function (modes + should not leak anything into the global scope!), i.e. write your + whole mode inside this function.</p> + + <p>The main responsibility of a mode script is <em>parsing</em> + the content of the editor. Depending on the language and the + amount of functionality desired, this can be done in really easy + or extremely complicated ways. Some parsers can be stateless, + meaning that they look at one element (<em>token</em>) of the code + at a time, with no memory of what came before. Most, however, will + need to remember something. This is done by using a <em>state + object</em>, which is an object that can be mutated every time a + new token is read.</p> + + <p id="startState">Modes that use a state must define + a <code>startState</code> method on their mode object. This is a + function of no arguments that produces a state object to be used + at the start of a document.</p> + + <p id="token">The most important part of a mode object is + its <code>token(stream, state)</code> method. All modes must + define this method. It should read one token from the stream it is + given as an argument, optionally update its state, and return a + CSS class string, or <code>null</code> for tokens that do not have + to be styled.<p> + + <p id="StringStream">The stream object encapsulates a line of code + (tokens may never span lines) and our current position in that + line. It has the following API:</p> + + <dl> + <dt><code>eol() → boolean</code></dt> + <dd>Returns true only if the stream is at the end of the + line.</dd> + <dt><code>sol() → boolean</code></dt> + <dd>Returns true only if the stream is at the start of the + line.</dd> + + <dt><code>peek() → character</code></dt> + <dd>Returns the next character in the stream without advancing + it. Will return <code>undefined</code> at the end of the + line.</dd> + <dt><code>next() → character</code></dt> + <dd>Returns the next character in the stream and advances it. + Also returns <code>undefined</code> when no more characters are + available.</dd> + + <dt><code>eat(match) → character</code></dt> + <dd><code>match</code> can be a character, a regular expression, + or a function that takes a character and returns a boolean. If + the next character in the stream 'matches' the given argument, + it is consumed and returned. Otherwise, <code>undefined</code> + is returned.</dd> + <dt><code>eatWhile(match) → boolean</code></dt> + <dd>Repeatedly calls <code>eat</code> with the given argument, + until it fails. Returns true if any characters were eaten.</dd> + <dt><code>eatSpace() → boolean</code></dt> + <dd>Shortcut for <code>eatWhile</code> when matching + white-space.</dd> + <dt><code>skipToEnd()</code></dt> + <dd>Moves the position to the end of the line.</dd> + <dt><code>skipTo(ch) → boolean</code></dt> + <dd>Skips to the next occurrence of the given character, if + found. Returns true if the character was found.</dd> + <dt><code>match(pattern, consume, caseFold) → boolean</code></dt> + <dd>Act like a + multi-character <code>eat</code>—if <code>consume</code> is true + or not given—or a look-ahead that doesn't update the stream + position—if it is false. <code>pattern</code> can be either a + string or a regular expression starting with <code>^</code>. + When it is a string, <code>caseFold</code> can be set to true to + make the match case-insensitive. When successfully matching a + regular expression, the returned value will be the array + returned by <code>match</code>, in case you need to extract + matched groups.</dd> + + <dt><code>backUp(n)</code></dt> + <dd>Backs up the stream <code>n</code> characters. Backing it up + further than the start of the current token will cause things to + break, so be careful.</dd> + <dt><code>column() → integer</code></dt> + <dd>Returns the column (taking into account tabs) at which the + current token starts. Can be used to find out whether a token + starts a new line.</dd> + <dt><code>indentation() → integer</code></dt> + <dd>Tells you how far the current line has been indented, in + spaces. Corrects for tab characters.</dd> + + <dt><code>current() → string</code></dt> + <dd>Get the string between the start of the current token and + the current stream position.</dd> + </dl> + + <p id="copyState">Because state object are mutated, and CodeMirror + needs to keep valid versions of a state around so that it can + restart a parse at any line, copies must be made of state objects. + The default algorithm used is that a new state object is created, + which gets all the properties of the old object. Any properties + which hold arrays get a copy of these arrays (since arrays tend to + be used as mutable stacks). When this is not correct, for example + because a mode mutates non-array properties of its state object, a + mode object should define a <code>copyState</code> method, + which is given a state and should return a safe copy of that + state.</p> + + <p id="indent">If you want your mode to provide smart indentation + (see <a href="#option_enterMode"><code>entermode</code></a> + and <a href="#option_tabMode"><code>tabMode</code></a> when they + have a value of <code>"indent"</code>), you must define + an <code>indent(state, textAfter)</code> method on your mode + object.</p> + + <p>The indentation method should inspect the given state object, + and optionally the <code>textAfter</code> string, which contains + the text on the line that is being indented, and return an + integer, the amount of spaces to indent. It should usually take + the <a href="#option_indentUnit"><code>indentUnit</code></a> + option into account.</p> + + <p id="electricChars">Finally, a mode may define + an <code>electricChars</code> property, which should hold a string + containing all the characters that should trigger the behaviour + described for + the <a href="#option_electricChars"><code>electricChars</code></a> + option.</p> + + <p>So, to summarize, a mode <em>must</em> provide + a <code>token</code> method, and it <em>may</em> + provide <code>startState</code>, <code>copyState</code>, + and <code>indent</code> methods. For an example of a trivial mode, + see the <a href="mode/diff/diff.js">diff mode</a>, for a more + involved example, see + the <a href="mode/javascript/javascript.js">JavaScript + mode</a>.</p> + + <p>Sometimes, it is useful for modes to <em>nest</em>—to have one + mode delegate work to another mode. An example of this kind of + mode is the <a href="mode/htmlmixed/htmlmixed.js">mixed-mode HTML + mode</a>. To implement such nesting, it is usually necessary to + create mode objects and copy states yourself. To create a mode + object, there are <code>CodeMirror.getMode(options, + parserConfig)</code>, where the first argument is a configuration + object as passed to the mode constructor function, and the second + argument is a mode specification as in + the <a href="#option_mode"><code>mode</code></a> option. To copy a + state object, call <code>CodeMirror.copyState(mode, state)</code>, + where <code>mode</code> is the mode that created the given + state.</p> + + <p>To make indentation work properly in a nested parser, it is + advisable to give the <code>startState</code> method of modes that + are intended to be nested an optional argument that provides the + base indentation for the block of code. The JavaScript and CSS + parser do this, for example, to allow JavaScript and CSS code + inside the mixed-mode HTML mode to be properly indented.</p> + + <p>Finally, it is possible to associate your mode, or a certain + configuration of your mode, with + a <a href="http://en.wikipedia.org/wiki/MIME">MIME</a> type. For + example, the JavaScript mode associates itself + with <code>text/javascript</code>, and its JSON variant + with <code>application/json</code>. To do this, + call <code>CodeMirror.defineMIME(mime, modeSpec)</code>, + where <code>modeSpec</code> can be a string or object specifying a + mode, as in the <a href="#option_mode"><code>mode</code></a> + option.</p> + +</div><div class="rightsmall blk"> + + <h2>Contents</h2> + + <ul> + <li><a href="#overview">Overview</a></li> + <li><a href="#usage">Basic Usage</a></li> + <li><a href="#config">Configuration</a></li> + <li><a href="#styling">Customized Styling</a></li> + <li><a href="#api">Programming API</a></li> + <li><a href="#modeapi">Writing CodeMirror Modes</a></li> + </ul> + +</div></div> + +<div style="height: 2em"> </div> + +<script type="text/javascript" src="css/font.js"></script> + + </body> +</html> Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/clike/clike.css =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/clike/clike.css (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/clike/clike.css 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,6 @@ +span.c-like-keyword {color: #90b;} +span.c-like-number {color: #291;} +span.c-like-comment {color: #a70;} +span.c-like-string {color: #a22;} +span.c-like-preprocessor {color: #049;} +span.c-like-var {color: #22b;} Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/clike/clike.js =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/clike/clike.js (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/clike/clike.js 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,181 @@ +CodeMirror.defineMode("clike", function(config, parserConfig) { + var indentUnit = config.indentUnit, keywords = parserConfig.keywords, + cpp = parserConfig.useCPP, multiLineStrings = parserConfig.multiLineStrings, $vars = parserConfig.$vars; + var isOperatorChar = /[+\-*&%=<>!?|]/; + + function chain(stream, state, f) { + state.tokenize = f; + return f(stream, state); + } + + var type; + function ret(tp, style) { + type = tp; + return style; + } + + function tokenBase(stream, state) { + var ch = stream.next(); + if (ch == '"' || ch == "'") + return chain(stream, state, tokenString(ch)); + else if (/[\[\]{},;\:\.]/.test(ch)) + return ret(ch); + else if (ch == "#" && cpp && state.startOfLine) { + stream.skipToEnd(); + return ret("directive", "c-like-preprocessor"); + } + else if (/\d/.test(ch)) { + stream.eatWhile(/[\w\.]/) + return ret("number", "c-like-number"); + } + else if (ch == "/") { + if (stream.eat("*")) { + return chain(stream, state, tokenComment); + } + else if (stream.eat("/")) { + stream.skipToEnd(); + return ret("comment", "c-like-comment"); + } + else { + stream.eatWhile(isOperatorChar); + return ret("operator"); + } + } + else if (isOperatorChar.test(ch)) { + stream.eatWhile(isOperatorChar); + return ret("operator"); + } + else if ($vars && ch == "$") { + stream.eatWhile(/[\w\$_]/); + return ret("word", "c-like-var"); + } + else { + stream.eatWhile(/[\w\$_]/); + if (keywords && keywords.propertyIsEnumerable(stream.current())) return ret("keyword", "c-like-keyword"); + return ret("word", "c-like-word"); + } + } + + function tokenString(quote) { + return function(stream, state) { + var escaped = false, next, end = false; + while ((next = stream.next()) != null) { + if (next == quote && !escaped) {end = true; break;} + escaped = !escaped && next == "\\"; + } + if (end || !(escaped || multiLineStrings)) + state.tokenize = tokenBase; + return ret("string", "c-like-string"); + }; + } + + function tokenComment(stream, state) { + var maybeEnd = false, ch; + while (ch = stream.next()) { + if (ch == "/" && maybeEnd) { + state.tokenize = tokenBase; + break; + } + maybeEnd = (ch == "*"); + } + return ret("comment", "c-like-comment"); + } + + function Context(indented, column, type, align, prev) { + this.indented = indented; + this.column = column; + this.type = type; + this.align = align; + this.prev = prev; + } + + function pushContext(state, col, type) { + return state.context = new Context(state.indented, col, type, null, state.context); + } + function popContext(state) { + return state.context = state.context.prev; + } + + // Interface + + return { + startState: function(basecolumn) { + return { + tokenize: tokenBase, + context: new Context((basecolumn || 0) - indentUnit, 0, "top", false), + indented: 0, + startOfLine: true + }; + }, + + token: function(stream, state) { + var ctx = state.context; + if (stream.sol()) { + if (ctx.align == null) ctx.align = false; + state.indented = stream.indentation(); + state.startOfLine = true; + } + if (stream.eatSpace()) return null; + var style = state.tokenize(stream, state); + if (type == "comment") return style; + if (ctx.align == null) ctx.align = true; + + if ((type == ";" || type == ":") && ctx.type == "statement") popContext(state); + else if (type == "{") pushContext(state, stream.column(), "}"); + else if (type == "[") pushContext(state, stream.column(), "]"); + else if (type == "(") pushContext(state, stream.column(), ")"); + else if (type == "}") { + if (ctx.type == "statement") ctx = popContext(state); + if (ctx.type == "}") ctx = popContext(state); + if (ctx.type == "statement") ctx = popContext(state); + } + else if (type == ctx.type) popContext(state); + else if (ctx.type == "}") pushContext(state, stream.column(), "statement"); + state.startOfLine = false; + return style; + }, + + indent: function(state, textAfter) { + if (state.tokenize != tokenBase) return 0; + var firstChar = textAfter && textAfter.charAt(0), ctx = state.context, closing = firstChar == ctx.type; + if (ctx.type == "statement") return ctx.indented + (firstChar == "{" ? 0 : indentUnit); + else if (ctx.align) return ctx.column + (closing ? 0 : 1); + else return ctx.indented + (closing ? 0 : indentUnit); + }, + + electricChars: "{}" + }; +}); + +(function() { + function keywords(str) { + var obj = {}, words = str.split(" "); + for (var i = 0; i < words.length; ++i) obj[words[i]] = true; + return obj; + } + var cKeywords = "auto if break int case long char register continue return default short do sizeof " + + "double static else struct entry switch extern typedef float union for unsigned " + + "goto while enum void const signed volatile"; + + CodeMirror.defineMIME("text/x-csrc", { + name: "clike", + useCPP: true, + keywords: keywords(cKeywords) + }); + CodeMirror.defineMIME("text/x-c++src", { + name: "clike", + useCPP: true, + keywords: keywords(cKeywords + " asm dynamic_cast namespace reinterpret_cast try bool explicit new " + + "static_cast typeid catch false operator template typename class friend private " + + "this using const_cast inline public throw virtual delete mutable protected true " + + "wchar_t") + }); + CodeMirror.defineMIME("text/x-java", { + name: "clike", + keywords: keywords("abstract assert boolean break byte case catch char class const continue default " + + "do double else enum extends false final finally float for goto if implements import " + + "instanceof int interface long native new null package private protected public " + + "return short static strictfp super switch synchronized this throw throws transient " + + "true try void volatile while") + }); +}()); Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/clike/index.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/clike/index.html (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/clike/index.html 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,101 @@ +<!doctype html> +<html> + <head> + <title>CodeMirror 2: C-like mode</title> + <link rel="stylesheet" href="../../lib/codemirror.css"> + <script src="../../lib/codemirror.js"></script> + <script src="clike.js"></script> + <link rel="stylesheet" href="clike.css"> + <link rel="stylesheet" href="../../css/docs.css"> + <style>.CodeMirror {border: 2px inset #dee;}</style> + </head> + <body> + <h1>CodeMirror 2: C-like mode</h1> + +<form><textarea id="code" name="code"> +/* C demo code */ + +#include <zmq.h> +#include <pthread.h> +#include <semaphore.h> +#include <time.h> +#include <stdio.h> +#include <fcntl.h> +#include <malloc.h> + +typedef struct { + void* arg_socket; + zmq_msg_t* arg_msg; + char* arg_string; + unsigned long arg_len; + int arg_int, arg_command; + + int signal_fd; + int pad; + void* context; + sem_t sem; +} acl_zmq_context; + +#define p(X) (context->arg_##X) + +void* zmq_thread(void* context_pointer) { + acl_zmq_context* context = (acl_zmq_context*)context_pointer; + char ok = 'K', err = 'X'; + int res; + + while (1) { + while ((res = sem_wait(&context->sem)) == EINTR); + if (res) {write(context->signal_fd, &err, 1); goto cleanup;} + switch(p(command)) { + case 0: goto cleanup; + case 1: p(socket) = zmq_socket(context->context, p(int)); break; + case 2: p(int) = zmq_close(p(socket)); break; + case 3: p(int) = zmq_bind(p(socket), p(string)); break; + case 4: p(int) = zmq_connect(p(socket), p(string)); break; + case 5: p(int) = zmq_getsockopt(p(socket), p(int), (void*)p(string), &p(len)); break; + case 6: p(int) = zmq_setsockopt(p(socket), p(int), (void*)p(string), p(len)); break; + case 7: p(int) = zmq_send(p(socket), p(msg), p(int)); break; + case 8: p(int) = zmq_recv(p(socket), p(msg), p(int)); break; + case 9: p(int) = zmq_poll(p(socket), p(int), p(len)); break; + } + p(command) = errno; + write(context->signal_fd, &ok, 1); + } + cleanup: + close(context->signal_fd); + free(context_pointer); + return 0; +} + +void* zmq_thread_init(void* zmq_context, int signal_fd) { + acl_zmq_context* context = malloc(sizeof(acl_zmq_context)); + pthread_t thread; + + context->context = zmq_context; + context->signal_fd = signal_fd; + sem_init(&context->sem, 1, 0); + pthread_create(&thread, 0, &zmq_thread, context); + pthread_detach(thread); + return context; +} +</textarea></form> + + <script> + var editor = CodeMirror.fromTextArea(document.getElementById("code"), { + lineNumbers: true, + matchBrackets: true, + mode: "text/x-csrc" + }); + </script> + + <p>Simple mode that tries to handle C-like languages as well as it + can. Takes two configuration parameters: <code>keywords</code>, an + object whose property names are the keywords in the language, + and <code>useCPP</code>, which determines whether C preprocessor + directives are recognized.</p> + + <p><strong>MIME types defined:</strong> <code>text/x-csrc</code> + (C code), <code>text/x-c++src</code> (C++ + code), <code>text/x-java</code> (Java code).</p> + </body> +</html> Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/css/css.css =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/css/css.css (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/css/css.css 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,9 @@ +span.css-at {color: #708;} +span.css-unit {color: #281;} +span.css-value {color: #708;} +span.css-identifier {color: black;} +span.css-selector {color: #11B;} +span.css-important {color: #00F;} +span.css-colorcode {color: #299;} +span.css-comment {color: #A70;} +span.css-string {color: #A22;} Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/css/css.js =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/css/css.js (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/css/css.js 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,124 @@ +CodeMirror.defineMode("css", function(config) { + var indentUnit = config.indentUnit, type; + function ret(style, tp) {type = tp; return style;} + + function tokenBase(stream, state) { + var ch = stream.next(); + if (ch == "@") {stream.eatWhile(/\w/); return ret("css-at", stream.current());} + else if (ch == "/" && stream.eat("*")) { + state.tokenize = tokenCComment; + return tokenCComment(stream, state); + } + else if (ch == "<" && stream.eat("!")) { + state.tokenize = tokenSGMLComment; + return tokenSGMLComment(stream, state); + } + else if (ch == "=") ret(null, "compare"); + else if ((ch == "~" || ch == "|") && stream.eat("=")) return ret(null, "compare"); + else if (ch == "\"" || ch == "'") { + state.tokenize = tokenString(ch); + return state.tokenize(stream, state); + } + else if (ch == "#") { + stream.eatWhile(/\w/); + return ret("css-selector", "hash"); + } + else if (ch == "!") { + stream.match(/^\s*\w*/); + return ret("css-important", "important"); + } + else if (/\d/.test(ch)) { + stream.eatWhile(/[\w.%]/); + return ret("css-unit", "unit"); + } + else if (/[,.+>*\/]/.test(ch)) { + return ret(null, "select-op"); + } + else if (/[;{}:\[\]]/.test(ch)) { + return ret(null, ch); + } + else { + stream.eatWhile(/[\w\\\-_]/); + return ret("css-identifier", "identifier"); + } + } + + function tokenCComment(stream, state) { + var maybeEnd = false, ch; + while ((ch = stream.next()) != null) { + if (maybeEnd && ch == "/") { + state.tokenize = tokenBase; + break; + } + maybeEnd = (ch == "*"); + } + return ret("css-comment", "comment"); + } + + function tokenSGMLComment(stream, state) { + var dashes = 0, ch; + while ((ch = stream.next()) != null) { + if (dashes >= 2 && ch == ">") { + state.tokenize = tokenBase; + break; + } + dashes = (ch == "-") ? dashes + 1 : 0; + } + return ret("css-comment", "comment"); + } + + function tokenString(quote) { + return function(stream, state) { + var escaped = false, ch; + while ((ch = stream.next()) != null) { + if (ch == quote && !escaped) + break; + escaped = !escaped && ch == "\\"; + } + if (!escaped) state.tokenize = tokenBase; + return ret("css-string", "string"); + }; + } + + return { + startState: function(base) { + return {tokenize: tokenBase, + baseIndent: base || 0, + stack: []}; + }, + + token: function(stream, state) { + if (stream.eatSpace()) return null; + var style = state.tokenize(stream, state); + + var context = state.stack[state.stack.length-1]; + if (type == "hash" && context == "rule") style = "css-colorcode"; + else if (style == "css-identifier") { + if (context == "rule") style = "css-value"; + else if (!context || context == "@media{") style = "css-selector"; + } + + if (context == "rule" && /^[\{\};]$/.test(type)) + state.stack.pop(); + if (type == "{") { + if (context == "@media") state.stack[state.stack.length-1] = "@media{"; + else state.stack.push("{"); + } + else if (type == "}") state.stack.pop(); + else if (type == "@media") state.stack.push("@media"); + else if (context != "rule" && context != "@media" && type != "comment") state.stack.push("rule"); + return style; + }, + + indent: function(state, textAfter) { + var n = state.stack.length; + if (/^\}/.test(textAfter)) + n -= state.stack[state.stack.length-1] == "rule" ? 2 : 1; + return state.baseIndent + n * indentUnit; + }, + + electricChars: "}" + }; +}); + +CodeMirror.defineMIME("text/css", "css"); Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/css/index.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/css/index.html (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/css/index.html 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,56 @@ +<!doctype html> +<html> + <head> + <title>CodeMirror 2: CSS mode</title> + <link rel="stylesheet" href="../../lib/codemirror.css"> + <script src="../../lib/codemirror.js"></script> + <script src="css.js"></script> + <link rel="stylesheet" href="css.css"> + <style>.CodeMirror {background: #f8f8f8;}</style> + <link rel="stylesheet" href="../../css/docs.css"> + </head> + <body> + <h1>CodeMirror 2: CSS mode</h1> + <form><textarea id="code" name="code"> +/* Some example CSS */ + +@import url("something.css"); + +body { + margin: 0; + padding: 3em 6em; + font-family: tahoma, arial, sans-serif; + color: #000; +} + +#navigation a { + font-weight: bold; + text-decoration: none !important; +} + +h1 { + font-size: 2.5em; +} + +h2 { + font-size: 1.7em; +} + +h1:before, h2:before { + content: "::"; +} + +code { + font-family: courier, monospace; + font-size: 80%; + color: #418A8A; +} +</textarea></form> + <script> + var editor = CodeMirror.fromTextArea(document.getElementById("code"), {}); + </script> + + <p><strong>MIME types defined:</strong> <code>text/css</code>.</p> + + </body> +</html> Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/diff/diff.css =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/diff/diff.css (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/diff/diff.css 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,3 @@ +span.diff-rangeinfo {color: #a0b;} +span.diff-minus {color: #a22;} +span.diff-plus {color: #2b2;} Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/diff/diff.js =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/diff/diff.js (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/diff/diff.js 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,13 @@ +CodeMirror.defineMode("diff", function() { + return { + token: function(stream) { + var ch = stream.next(); + stream.skipToEnd(); + if (ch == "+") return "diff-plus"; + if (ch == "-") return "diff-minus"; + if (ch == "@") return "diff-rangeinfo"; + } + }; +}); + +CodeMirror.defineMIME("text/x-diff", "diff"); Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/diff/index.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/diff/index.html (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/diff/index.html 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,99 @@ +<!doctype html> +<html> + <head> + <title>CodeMirror 2: Diff mode</title> + <link rel="stylesheet" href="../../lib/codemirror.css"> + <script src="../../lib/codemirror.js"></script> + <script src="diff.js"></script> + <link rel="stylesheet" href="diff.css"> + <style>.CodeMirror {border-top: 1px solid #ddd; border-bottom: 1px solid #ddd;}</style> + <link rel="stylesheet" href="../../css/docs.css"> + </head> + <body> + <h1>CodeMirror 2: Diff mode</h1> + <form><textarea id="code" name="code"> +diff --git a/index.html b/index.html +index c1d9156..7764744 100644 +--- a/index.html ++++ b/index.html +@@ -95,7 +95,8 @@ StringStream.prototype = { + <script> + var editor = CodeMirror.fromTextArea(document.getElementById("code"), { + lineNumbers: true, +- autoMatchBrackets: true ++ autoMatchBrackets: true, ++ onGutterClick: function(x){console.log(x);} + }); + </script> + </body> +diff --git a/lib/codemirror.js b/lib/codemirror.js +index 04646a9..9a39cc7 100644 +--- a/lib/codemirror.js ++++ b/lib/codemirror.js +@@ -399,10 +399,16 @@ var CodeMirror = (function() { + } + + function onMouseDown(e) { +- var start = posFromMouse(e), last = start; ++ var start = posFromMouse(e), last = start, target = e.target(); + if (!start) return; + setCursor(start.line, start.ch, false); + if (e.button() != 1) return; ++ if (target.parentNode == gutter) { ++ if (options.onGutterClick) ++ options.onGutterClick(indexOf(gutter.childNodes, target) + showingFrom); ++ return; ++ } ++ + if (!focused) onFocus(); + + e.stop(); +@@ -808,7 +814,7 @@ var CodeMirror = (function() { + for (var i = showingFrom; i < showingTo; ++i) { + var marker = lines[i].gutterMarker; + if (marker) html.push('<div class="' + marker.style + '">' + htmlEscape(marker.text) + '</div>'); +- else html.push("<div>" + (options.lineNumbers ? i + 1 : "\u00a0") + "</div>"); ++ else html.push("<div>" + (options.lineNumbers ? i + options.firstLineNumber : "\u00a0") + "</div>"); + } + gutter.style.display = "none"; // TODO test whether this actually helps + gutter.innerHTML = html.join(""); +@@ -1371,10 +1377,8 @@ var CodeMirror = (function() { + if (option == "parser") setParser(value); + else if (option === "lineNumbers") setLineNumbers(value); + else if (option === "gutter") setGutter(value); +- else if (option === "readOnly") options.readOnly = value; +- else if (option === "indentUnit") {options.indentUnit = indentUnit = value; setParser(options.parser);} +- else if (/^(?:enterMode|tabMode|indentWithTabs|readOnly|autoMatchBrackets|undoDepth)$/.test(option)) options[option] = value; +- else throw new Error("Can't set option " + option); ++ else if (option === "indentUnit") {options.indentUnit = value; setParser(options.parser);} ++ else options[option] = value; + }, + cursorCoords: cursorCoords, + undo: operation(undo), +@@ -1402,7 +1406,8 @@ var CodeMirror = (function() { + replaceRange: operation(replaceRange), + + operation: function(f){return operation(f)();}, +- refresh: function(){updateDisplay([{from: 0, to: lines.length}]);} ++ refresh: function(){updateDisplay([{from: 0, to: lines.length}]);}, ++ getInputField: function(){return input;} + }; + return instance; + } +@@ -1420,6 +1425,7 @@ var CodeMirror = (function() { + readOnly: false, + onChange: null, + onCursorActivity: null, ++ onGutterClick: null, + autoMatchBrackets: false, + workTime: 200, + workDelay: 300, +</textarea></form> + <script> + var editor = CodeMirror.fromTextArea(document.getElementById("code"), {}); + </script> + + <p><strong>MIME types defined:</strong> <code>text/x-diff</code>.</p> + + </body> +</html> Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/haskell/haskell.css =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/haskell/haskell.css (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/haskell/haskell.css 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,25 @@ +span.hs-char, +span.hs-float, +span.hs-integer, +span.hs-string {color: #762;} + +span.hs-comment {color: #262;font-style: italic;} +span.hs-pragma {color: #555;font-style: italic;} + +span.hs-special, +span.hs-varid, +span.hs-varsym {color: #000;} + +span.hs-conid, +span.hs-consym {color: #b11;} + +span.hs-qualifier {color: #555;} + +span.hs-reservedid, +span.hs-reservedop {color: #730;} + +span.hs-prelude-varid, +span.hs-prelude-varsym {color: #30a;} +span.hs-prelude-conid {color: #b11;} + +span.hs-error {background-color: #fdd;} Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/haskell/haskell.js =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/haskell/haskell.js (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/haskell/haskell.js 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,242 @@ +CodeMirror.defineMode("haskell", function(cmCfg, modeCfg) { + + function switchState(source, setState, f) { + setState(f); + return f(source, setState); + } + + // These should all be Unicode extended, as per the Haskell 2010 report + var smallRE = /[a-z_]/; + var largeRE = /[A-Z]/; + var digitRE = /[0-9]/; + var hexitRE = /[0-9A-Fa-f]/; + var octitRE = /[0-7]/; + var idRE = /[a-z_A-Z0-9']/; + var symbolRE = /[-!#$%&*+.\/<=>?@\\^|~:]/; + var specialRE = /[(),;[\]`{}]/; + var whiteCharRE = /[ \t\v\f]/; // newlines are handled in tokenizer + + function normal(source, setState) { + if (source.eatWhile(whiteCharRE)) { + return null; + } + + var ch = source.next(); + if (specialRE.test(ch)) { + if (ch == '{' && source.eat('-')) { + var t = "hs-comment"; + if (source.eat('#')) { + t = "hs-pragma"; + } + return switchState(source, setState, ncomment(t, 1)); + } + return "hs-special"; + } + + if (ch == '\'') { + if (source.eat('\\')) { + source.next(); // should handle other escapes here + } + else { + source.next(); + } + if (source.eat('\'')) { + return "hs-char"; + } + return "hs-error"; + } + + if (ch == '"') { + return switchState(source, setState, stringLiteral); + } + + if (largeRE.test(ch)) { + source.eatWhile(idRE); + if (source.eat('.')) { + return "hs-qualifier"; + } + return "hs-conid"; + } + + if (smallRE.test(ch)) { + source.eatWhile(idRE); + return "hs-varid"; + } + + if (digitRE.test(ch)) { + if (ch == '0') { + if (source.eat(/[xX]/)) { + source.eatWhile(hexitRE); // should require at least 1 + return "hs-integer"; + } + if (source.eat(/[oO]/)) { + source.eatWhile(octitRE); // should require at least 1 + return "hs-integer"; + } + } + source.eatWhile(digitRE); + var t = "hs-integer"; + if (source.eat('.')) { + t = "hs-float"; + source.eatWhile(digitRE); // should require at least 1 + } + if (source.eat(/[eE]/)) { + t = "hs-float"; + source.eat(/[-+]/); + source.eatWhile(digitRE); // should require at least 1 + } + return t; + } + + if (symbolRE.test(ch)) { + if (ch == '-' && source.eat(/-/)) { + source.eatWhile(/-/); + if (!source.eat(symbolRE)) { + source.skipToEnd(); + return "hs-comment"; + } + } + var t = "hs-varsym"; + if (ch == ':') { + t = "hs-consym"; + } + source.eatWhile(symbolRE); + return t; + } + + return "hs-error"; + } + + function ncomment(type, nest) { + if (nest == 0) { + return normal; + } + return function(source, setState) { + var currNest = nest; + while (!source.eol()) { + ch = source.next(); + if (ch == '{' && source.eat('-')) { + ++currNest; + } + else if (ch == '-' && source.eat('}')) { + --currNest; + if (currNest == 0) { + setState(normal); + return type; + } + } + } + setState(ncomment(type, currNest)); + return type; + } + } + + function stringLiteral(source, setState) { + while (!source.eol()) { + var ch = source.next(); + if (ch == '"') { + setState(normal); + return "hs-string"; + } + if (ch == '\\') { + if (source.eol() || source.eat(whiteCharRE)) { + setState(stringGap); + return "hs-string"; + } + if (source.eat('&')) { + } + else { + source.next(); // should handle other escapes here + } + } + } + setState(normal); + return "hs-error"; + } + + function stringGap(source, setState) { + if (source.eat('\\')) { + return switchState(source, setState, stringLiteral); + } + source.next(); + setState(normal); + return "hs-error"; + } + + + var wellKnownWords = (function() { + var wkw = {}; + function setType(t) { + return function () { + for (var i = 0; i < arguments.length; i++) + wkw[arguments[i]] = t; + } + } + + setType("hs-reservedid")( + "case", "class", "data", "default", "deriving", "do", "else", "foreign", + "if", "import", "in", "infix", "infixl", "infixr", "instance", "let", + "module", "newtype", "of", "then", "type", "where", "_"); + + setType("hs-reservedop")( + "\.\.", ":", "::", "=", "\\", "\"", "<-", "->", "@", "~", "=>"); + + setType("hs-prelude-varsym")( + "!!", "$!", "$", "&&", "+", "++", "-", ".", "/", "/=", "<", "<=", "=<<", + "==", ">", ">=", ">>", ">>=", "^", "^^", "||", "*", "**"); + + setType("hs-prelude-conid")( + "Bool", "Bounded", "Char", "Double", "EQ", "Either", "Enum", "Eq", + "False", "FilePath", "Float", "Floating", "Fractional", "Functor", "GT", + "IO", "IOError", "Int", "Integer", "Integral", "Just", "LT", "Left", + "Maybe", "Monad", "Nothing", "Num", "Ord", "Ordering", "Rational", "Read", + "ReadS", "Real", "RealFloat", "RealFrac", "Right", "Show", "ShowS", + "String", "True"); + + setType("hs-prelude-varid")( + "abs", "acos", "acosh", "all", "and", "any", "appendFile", "asTypeOf", + "asin", "asinh", "atan", "atan2", "atanh", "break", "catch", "ceiling", + "compare", "concat", "concatMap", "const", "cos", "cosh", "curry", + "cycle", "decodeFloat", "div", "divMod", "drop", "dropWhile", "either", + "elem", "encodeFloat", "enumFrom", "enumFromThen", "enumFromThenTo", + "enumFromTo", "error", "even", "exp", "exponent", "fail", "filter", + "flip", "floatDigits", "floatRadix", "floatRange", "floor", "fmap", + "foldl", "foldl1", "foldr", "foldr1", "fromEnum", "fromInteger", + "fromIntegral", "fromRational", "fst", "gcd", "getChar", "getContents", + "getLine", "head", "id", "init", "interact", "ioError", "isDenormalized", + "isIEEE", "isInfinite", "isNaN", "isNegativeZero", "iterate", "last", + "lcm", "length", "lex", "lines", "log", "logBase", "lookup", "map", + "mapM", "mapM_", "max", "maxBound", "maximum", "maybe", "min", "minBound", + "minimum", "mod", "negate", "not", "notElem", "null", "odd", "or", + "otherwise", "pi", "pred", "print", "product", "properFraction", + "putChar", "putStr", "putStrLn", "quot", "quotRem", "read", "readFile", + "readIO", "readList", "readLn", "readParen", "reads", "readsPrec", + "realToFrac", "recip", "rem", "repeat", "replicate", "return", "reverse", + "round", "scaleFloat", "scanl", "scanl1", "scanr", "scanr1", "seq", + "sequence", "sequence_", "show", "showChar", "showList", "showParen", + "showString", "shows", "showsPrec", "significand", "signum", "sin", + "sinh", "snd", "span", "splitAt", "sqrt", "subtract", "succ", "sum", + "tail", "take", "takeWhile", "tan", "tanh", "toEnum", "toInteger", + "toRational", "truncate", "uncurry", "undefined", "unlines", "until", + "unwords", "unzip", "unzip3", "userError", "words", "writeFile", "zip", + "zip3", "zipWith", "zipWith3"); + + return wkw; + })(); + + + + return { + startState: function () { return { f: normal }; }, + copyState: function (s) { return { f: s.f }; }, + + token: function(stream, state) { + var t = state.f(stream, function(s) { state.f = s; }); + var w = stream.current(); + return (w in wellKnownWords) ? wellKnownWords[w] : t; + } + }; + +}); + +CodeMirror.defineMIME("text/x-haskell", "haskell"); Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/haskell/index.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/haskell/index.html (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/haskell/index.html 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,59 @@ +<!doctype html> +<html> + <head> + <title>CodeMirror 2: Haskell mode</title> + <link rel="stylesheet" href="../../lib/codemirror.css"> + <script src="../../lib/codemirror.js"></script> + <script src="haskell.js"></script> + <link rel="stylesheet" href="haskell.css"> + <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style> + <link rel="stylesheet" href="../../css/docs.css"> + </head> + <body> + <h1>CodeMirror 2: Haskell mode</h1> + +<form><textarea id="code" name="code"> +module UniquePerms ( + uniquePerms + ) +where + +-- | Find all unique permutations of a list where there might be duplicates. +uniquePerms :: (Eq a) => [a] -> [[a]] +uniquePerms = permBag . makeBag + +-- | An unordered collection where duplicate values are allowed, +-- but represented with a single value and a count. +type Bag a = [(a, Int)] + +makeBag :: (Eq a) => [a] -> Bag a +makeBag [] = [] +makeBag (a:as) = mix a $ makeBag as + where + mix a [] = [(a,1)] + mix a (bn@(b,n):bs) | a == b = (b,n+1):bs + | otherwise = bn : mix a bs + +permBag :: Bag a -> [[a]] +permBag [] = [[]] +permBag bs = concatMap (\(f,cs) -> map (f:) $ permBag cs) . oneOfEach $ bs + where + oneOfEach [] = [] + oneOfEach (an@(a,n):bs) = + let bs' = if n == 1 then bs else (a,n-1):bs + in (a,bs') : mapSnd (an:) (oneOfEach bs) + + apSnd f (a,b) = (a, f b) + mapSnd = map . apSnd +</textarea></form> + + <script> + var editor = CodeMirror.fromTextArea(document.getElementById("code"), { + lineNumbers: true, + matchBrackets: true + }); + </script> + + <p><strong>MIME types defined:</strong> <code>text/x-haskell</code>.</p> + </body> +</html> Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/htmlmixed/htmlmixed.js =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/htmlmixed/htmlmixed.js (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/htmlmixed/htmlmixed.js 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,66 @@ +CodeMirror.defineMode("htmlmixed", function(config, parserConfig) { + var htmlMode = CodeMirror.getMode(config, {name: "xml", htmlMode: true}); + var jsMode = CodeMirror.getMode(config, "javascript"); + var cssMode = CodeMirror.getMode(config, "css"); + + function html(stream, state) { + var style = htmlMode.token(stream, state.htmlState); + if (style == "xml-tag" && stream.current() == ">" && state.htmlState.context) { + if (/^script$/i.test(state.htmlState.context.tagName)) { + state.token = javascript; + state.localState = jsMode.startState(htmlMode.indent(state.htmlState, "")); + } + else if (/^style$/i.test(state.htmlState.context.tagName)) { + state.token = css; + state.localState = cssMode.startState(htmlMode.indent(state.htmlState, "")); + } + } + return style; + } + function javascript(stream, state) { + if (stream.match(/^<\/\s*script\s*>/i, false)) { + state.token = html; + state.curState = null; + return html(stream, state); + } + return jsMode.token(stream, state.localState); + } + function css(stream, state) { + if (stream.match(/^<\/\s*style\s*>/i, false)) { + state.token = html; + state.localState = null; + return html(stream, state); + } + return cssMode.token(stream, state.localState); + } + + return { + startState: function() { + var state = htmlMode.startState(); + return {token: html, localState: null, htmlState: state}; + }, + + copyState: function(state) { + if (state.localState) + var local = CodeMirror.copyState(state.token == css ? cssMode : jsMode, state.localState); + return {token: state.token, localState: local, htmlState: CodeMirror.copyState(htmlMode, state.htmlState)}; + }, + + token: function(stream, state) { + return state.token(stream, state); + }, + + indent: function(state, textAfter) { + if (state.token == html || /^\s*<\//.test(textAfter)) + return htmlMode.indent(state.htmlState, textAfter); + else if (state.token == javascript) + return jsMode.indent(state.localState, textAfter); + else + return cssMode.indent(state.localState, textAfter); + }, + + electricChars: "/{}:" + } +}); + +CodeMirror.defineMIME("text/html", "htmlmixed"); Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/htmlmixed/index.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/htmlmixed/index.html (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/htmlmixed/index.html 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,54 @@ +<!doctype html> +<html> + <head> + <title>CodeMirror 2: HTML mixed mode</title> + <link rel="stylesheet" href="../../lib/codemirror.css"> + <script src="../../lib/codemirror.js"></script> + <script src="../xml/xml.js"></script> + <link rel="stylesheet" href="../xml/xml.css"> + <script src="../javascript/javascript.js"></script> + <link rel="stylesheet" href="../javascript/javascript.css"> + <script src="../css/css.js"></script> + <link rel="stylesheet" href="../css/css.css"> + <script src="htmlmixed.js"></script> + <link rel="stylesheet" href="../../css/docs.css"> + <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style> + </head> + <body> + <h1>CodeMirror 2: HTML mixed mode</h1> + <form><textarea id="code" name="code"> +<html style="color: green"> +  + <head> + <title>Mixed HTML Example</title> + <style type="text/css"> + h1 {font-family: comic sans; color: #f0f;} + div {background: yellow !important;} + body { + max-width: 50em; + margin: 1em 2em 1em 5em; + } + </style> + </head> + <body> + <h1>Mixed HTML Example</h1> + <script> + function jsFunc(arg1, arg2) { + if (arg1 && arg2) document.body.innerHTML = "achoo"; + } + </script> + </body> +</html> +</textarea></form> + <script> + var editor = CodeMirror.fromTextArea(document.getElementById("code"), {mode: "text/html", tabMode: "indent"}); + </script> + + <p>The HTML mixed mode depends on the XML, JavaScript, and CSS modes.</p> + + <p><strong>MIME types defined:</strong> <code>text/html</code> + (redefined, only takes effect if you load this parser after the + XML parser).</p> + + </body> +</html> Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/javascript/index.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/javascript/index.html (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/javascript/index.html 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,78 @@ +<!doctype html> +<html> + <head> + <title>CodeMirror 2: JavaScript mode</title> + <link rel="stylesheet" href="../../lib/codemirror.css"> + <script src="../../lib/codemirror.js"></script> + <script src="javascript.js"></script> + <link rel="stylesheet" href="javascript.css"> + <link rel="stylesheet" href="../../css/docs.css"> + <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style> + </head> + <body> + <h1>CodeMirror 2: JavaScript mode</h1> + +<div><textarea id="code" name="code"> +// Demo code (the actual new parser character stream implementation) + +function StringStream(string) { + this.pos = 0; + this.string = string; +} + +StringStream.prototype = { + done: function() {return this.pos >= this.string.length;}, + peek: function() {return this.string.charAt(this.pos);}, + next: function() { + if (this.pos < this.string.length) + return this.string.charAt(this.pos++); + }, + eat: function(match) { + var ch = this.string.charAt(this.pos); + if (typeof match == "string") var ok = ch == match; + else var ok = ch && match.test ? match.test(ch) : match(ch); + if (ok) {this.pos++; return ch;} + }, + eatWhile: function(match) { + var start = this.pos; + while (this.eat(match)); + if (this.pos > start) return this.string.slice(start, this.pos); + }, + backUp: function(n) {this.pos -= n;}, + column: function() {return this.pos;}, + eatSpace: function() { + var start = this.pos; + while (/\s/.test(this.string.charAt(this.pos))) this.pos++; + return this.pos - start; + }, + match: function(pattern, consume, caseInsensitive) { + if (typeof pattern == "string") { + function cased(str) {return caseInsensitive ? str.toLowerCase() : str;} + if (cased(this.string).indexOf(cased(pattern), this.pos) == this.pos) { + if (consume !== false) this.pos += str.length; + return true; + } + } + else { + var match = this.string.slice(this.pos).match(pattern); + if (match && consume !== false) this.pos += match[0].length; + return match; + } + } +}; +</textarea></div> + + <script> + var editor = CodeMirror.fromTextArea(document.getElementById("code"), { + lineNumbers: true, + matchBrackets: true + }); + </script> + + <p>JavaScript mode supports a single configuration + option, <code>json</code>, which will set the mode to expect JSON + data rather than a JavaScript program.</p> + + <p><strong>MIME types defined:</strong> <code>text/javascript</code>, <code>application/json</code>.</p> + </body> +</html> Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/javascript/javascript.css =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/javascript/javascript.css (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/javascript/javascript.css 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,6 @@ +span.js-keyword {color: #90b;} +span.js-atom {color: #291;} +span.js-variabledef {color: #00f;} +span.js-localvariable {color: #049;} +span.js-comment {color: #a70;} +span.js-string {color: #a22;} Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/javascript/javascript.js =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/javascript/javascript.js (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/javascript/javascript.js 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,348 @@ +CodeMirror.defineMode("javascript", function(config, parserConfig) { + var indentUnit = config.indentUnit; + var jsonMode = parserConfig.json; + + // Tokenizer + + var keywords = function(){ + function kw(type) {return {type: type, style: "js-keyword"};} + var A = kw("keyword a"), B = kw("keyword b"), C = kw("keyword c"); + var operator = kw("operator"), atom = {type: "atom", style: "js-atom"}; + return { + "if": A, "while": A, "with": A, "else": B, "do": B, "try": B, "finally": B, + "return": C, "break": C, "continue": C, "new": C, "delete": C, "throw": C, + "var": kw("var"), "function": kw("function"), "catch": kw("catch"), + "for": kw("for"), "switch": kw("switch"), "case": kw("case"), "default": kw("default"), + "in": operator, "typeof": operator, "instanceof": operator, + "true": atom, "false": atom, "null": atom, "undefined": atom, "NaN": atom, "Infinity": atom + }; + }(); + + var isOperatorChar = /[+\-*&%=<>!?|]/; + + function chain(stream, state, f) { + state.tokenize = f; + return f(stream, state); + } + + function nextUntilUnescaped(stream, end) { + var escaped = false, next; + while ((next = stream.next()) != null) { + if (next == end && !escaped) + return false; + escaped = !escaped && next == "\\"; + } + return escaped; + } + + // Used as scratch variables to communicate multiple values without + // consing up tons of objects. + var type, content; + function ret(tp, style, cont) { + type = tp; content = cont; + return style; + } + + function jsTokenBase(stream, state) { + var ch = stream.next(); + if (ch == '"' || ch == "'") + return chain(stream, state, jsTokenString(ch)); + else if (/[\[\]{},;\:\.]/.test(ch)) + return ret(ch); + else if (ch == "0" && stream.eat(/x/i)) { + stream.eatWhile(/[\da-f]/i); + return ret("number", "js-atom"); + } + else if (/\d/.test(ch)) { + stream.match(/^\d*(?:\.\d*)?(?:e[+\-]?\d+)?/); + return ret("number", "js-atom"); + } + else if (ch == "/") { + if (stream.eat("*")) { + return chain(stream, state, jsTokenComment); + } + else if (stream.eat("/")) { + stream.skipToEnd(); + return ret("comment", "js-comment"); + } + else if (state.reAllowed) { + nextUntilUnescaped(stream, "/"); + stream.eatWhile(/[gimy]/); // 'y' is "sticky" option in Mozilla + return ret("regexp", "js-string"); + } + else { + stream.eatWhile(isOperatorChar); + return ret("operator", null, stream.current()); + } + } + else if (isOperatorChar.test(ch)) { + stream.eatWhile(isOperatorChar); + return ret("operator", null, stream.current()); + } + else { + stream.eatWhile(/[\w\$_]/); + var word = stream.current(), known = keywords.propertyIsEnumerable(word) && keywords[word]; + return known ? ret(known.type, known.style, word) : + ret("variable", "js-variable", word); + } + } + + function jsTokenString(quote) { + return function(stream, state) { + if (!nextUntilUnescaped(stream, quote)) + state.tokenize = jsTokenBase; + return ret("string", "js-string"); + }; + } + + function jsTokenComment(stream, state) { + var maybeEnd = false, ch; + while (ch = stream.next()) { + if (ch == "/" && maybeEnd) { + state.tokenize = jsTokenBase; + break; + } + maybeEnd = (ch == "*"); + } + return ret("comment", "js-comment"); + } + + // Parser + + var atomicTypes = {"atom": true, "number": true, "variable": true, "string": true, "regexp": true}; + + function JSLexical(indented, column, type, align, prev, info) { + this.indented = indented; + this.column = column; + this.type = type; + this.prev = prev; + this.info = info; + if (align != null) this.align = align; + } + + function inScope(state, varname) { + for (var v = state.localVars; v; v = v.next) + if (v.name == varname) return true; + } + + function parseJS(state, style, type, content, stream) { + var cc = state.cc; + // Communicate our context to the combinators. + // (Less wasteful than consing up a hundred closures on every call.) + cx.state = state; cx.stream = stream; cx.marked = null, cx.cc = cc; + + if (!state.lexical.hasOwnProperty("align")) + state.lexical.align = true; + + while(true) { + var combinator = cc.length ? cc.pop() : jsonMode ? expression : statement; + if (combinator(type, content)) { + while(cc.length && cc[cc.length - 1].lex) + cc.pop()(); + if (cx.marked) return cx.marked; + if (type == "variable" && inScope(state, content)) return "js-localvariable"; + return style; + } + } + } + + // Combinator utils + + var cx = {state: null, column: null, marked: null, cc: null}; + function pass() { + for (var i = arguments.length - 1; i >= 0; i--) cx.cc.push(arguments[i]); + } + function cont() { + pass.apply(null, arguments); + return true; + } + function register(varname) { + var state = cx.state; + if (state.context) { + cx.marked = "js-variabledef"; + for (var v = state.localVars; v; v = v.next) + if (v.name == varname) return; + state.localVars = {name: varname, next: state.localVars}; + } + } + + // Combinators + + var defaultVars = {name: "this", next: {name: "arguments"}}; + function pushcontext() { + if (!cx.state.context) cx.state.localVars = defaultVars; + cx.state.context = {prev: cx.state.context, vars: cx.state.localVars}; + } + function popcontext() { + cx.state.localVars = cx.state.context.vars; + cx.state.context = cx.state.context.prev; + } + function pushlex(type, info) { + var result = function() { + var state = cx.state; + state.lexical = new JSLexical(state.indented, cx.stream.column(), type, null, state.lexical, info) + }; + result.lex = true; + return result; + } + function poplex() { + var state = cx.state; + if (state.lexical.prev) { + if (state.lexical.type == ")") + state.indented = state.lexical.indented; + state.lexical = state.lexical.prev; + } + } + poplex.lex = true; + + function expect(wanted) { + return function expecting(type) { + if (type == wanted) return cont(); + else if (wanted == ";") return pass(); + else return cont(arguments.callee); + }; + } + + function statement(type) { + if (type == "var") return cont(pushlex("vardef"), vardef1, expect(";"), poplex); + if (type == "keyword a") return cont(pushlex("form"), expression, statement, poplex); + if (type == "keyword b") return cont(pushlex("form"), statement, poplex); + if (type == "{") return cont(pushlex("}"), block, poplex); + if (type == ";") return cont(); + if (type == "function") return cont(functiondef); + if (type == "for") return cont(pushlex("form"), expect("("), pushlex(")"), forspec1, expect(")"), + poplex, statement, poplex); + if (type == "variable") return cont(pushlex("stat"), maybelabel); + if (type == "switch") return cont(pushlex("form"), expression, pushlex("}", "switch"), expect("{"), + block, poplex, poplex); + if (type == "case") return cont(expression, expect(":")); + if (type == "default") return cont(expect(":")); + if (type == "catch") return cont(pushlex("form"), pushcontext, expect("("), funarg, expect(")"), + statement, poplex, popcontext); + return pass(pushlex("stat"), expression, expect(";"), poplex); + } + function expression(type) { + if (atomicTypes.hasOwnProperty(type)) return cont(maybeoperator); + if (type == "function") return cont(functiondef); + if (type == "keyword c") return cont(expression); + if (type == "(") return cont(pushlex(")"), expression, expect(")"), poplex, maybeoperator); + if (type == "operator") return cont(expression); + if (type == "[") return cont(pushlex("]"), commasep(expression, "]"), poplex, maybeoperator); + if (type == "{") return cont(pushlex("}"), commasep(objprop, "}"), poplex, maybeoperator); + return cont(); + } + function maybeoperator(type, value) { + if (type == "operator" && /\+\+|--/.test(value)) return cont(maybeoperator); + if (type == "operator") return cont(expression); + if (type == ";") return; + if (type == "(") return cont(pushlex(")"), commasep(expression, ")"), poplex, maybeoperator); + if (type == ".") return cont(property, maybeoperator); + if (type == "[") return cont(pushlex("]"), expression, expect("]"), poplex, maybeoperator); + } + function maybelabel(type) { + if (type == ":") return cont(poplex, statement); + return pass(maybeoperator, expect(";"), poplex); + } + function property(type) { + if (type == "variable") {cx.marked = "js-property"; return cont();} + } + function objprop(type) { + if (type == "variable") cx.marked = "js-property"; + if (atomicTypes.hasOwnProperty(type)) return cont(expect(":"), expression); + } + function commasep(what, end) { + function proceed(type) { + if (type == ",") return cont(what, proceed); + if (type == end) return cont(); + return cont(expect(end)); + } + return function commaSeparated(type) { + if (type == end) return cont(); + else return pass(what, proceed); + }; + } + function block(type) { + if (type == "}") return cont(); + return pass(statement, block); + } + function vardef1(type, value) { + if (type == "variable"){register(value); return cont(vardef2);} + return cont(); + } + function vardef2(type, value) { + if (value == "=") return cont(expression, vardef2); + if (type == ",") return cont(vardef1); + } + function forspec1(type) { + if (type == "var") return cont(vardef1, forspec2); + if (type == ";") return pass(forspec2); + if (type == "variable") return cont(formaybein); + return pass(forspec2); + } + function formaybein(type, value) { + if (value == "in") return cont(expression); + return cont(maybeoperator, forspec2); + } + function forspec2(type, value) { + if (type == ";") return cont(forspec3); + if (value == "in") return cont(expression); + return cont(expression, expect(";"), forspec3); + } + function forspec3(type) { + if (type != ")") cont(expression); + } + function functiondef(type, value) { + if (type == "variable") {register(value); return cont(functiondef);} + if (type == "(") return cont(pushlex(")"), pushcontext, commasep(funarg, ")"), poplex, statement, popcontext); + } + function funarg(type, value) { + if (type == "variable") {register(value); return cont();} + } + + // Interface + + return { + startState: function(basecolumn) { + return { + tokenize: jsTokenBase, + reAllowed: true, + cc: [], + lexical: new JSLexical((basecolumn || 0) - indentUnit, 0, "block", false), + localVars: null, + context: null, + indented: 0 + }; + }, + + token: function(stream, state) { + if (stream.sol()) { + if (!state.lexical.hasOwnProperty("align")) + state.lexical.align = false; + state.indented = stream.indentation(); + } + if (stream.eatSpace()) return null; + var style = state.tokenize(stream, state); + if (type == "comment") return style; + state.reAllowed = type == "operator" || type == "keyword c" || type.match(/^[\[{}\(,;:]$/); + return parseJS(state, style, type, content, stream); + }, + + indent: function(state, textAfter) { + if (state.tokenize != jsTokenBase) return 0; + var firstChar = textAfter && textAfter.charAt(0), lexical = state.lexical, + type = lexical.type, closing = firstChar == type; + if (type == "vardef") return lexical.indented + 4; + else if (type == "form" && firstChar == "{") return lexical.indented; + else if (type == "stat" || type == "form") return lexical.indented + indentUnit; + else if (lexical.info == "switch" && !closing) + return lexical.indented + (/^(?:case|default)\b/.test(textAfter) ? indentUnit : 2 * indentUnit); + else if (lexical.align) return lexical.column + (closing ? 0 : 1); + else return lexical.indented + (closing ? 0 : indentUnit); + }, + + electricChars: ":{}" + }; +}); + +CodeMirror.defineMIME("text/javascript", "javascript"); +CodeMirror.defineMIME("application/json", {name: "javascript", json: true}); Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/php/index.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/php/index.html (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/php/index.html 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,52 @@ +<!doctype html> +<html> + <head> + <title>CodeMirror 2: PHP mode</title> + <link rel="stylesheet" href="../../lib/codemirror.css"> + <script src="../../lib/codemirror.js"></script> + <script src="../xml/xml.js"></script> + <link rel="stylesheet" href="../xml/xml.css"> + <script src="../javascript/javascript.js"></script> + <link rel="stylesheet" href="../javascript/javascript.css"> + <script src="../css/css.js"></script> + <link rel="stylesheet" href="../css/css.css"> + <script src="../clike/clike.js"></script> + <link rel="stylesheet" href="../clike/clike.css"> + <script src="php.js"></script> + <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style> + <link rel="stylesheet" href="../../css/docs.css"> + </head> + <body> + <h1>CodeMirror 2: PHP mode</h1> + +<form><textarea id="code" name="code"> +<?php +function hello($who) { + return "Hello " . $who; +} +?> +<p>The program says <?= hello("World") ?>.</p> +<script> + alert("And here is some JS code"); // also colored +</script> +</textarea></form> + + <script> + var editor = CodeMirror.fromTextArea(document.getElementById("code"), { + lineNumbers: true, + matchBrackets: true, + mode: "application/x-httpd-php", + indentUnit: 8, + indentWithTabs: true, + enterMode: "keep", + tabMode: "shift" + }); + </script> + + <p>Simple HTML/PHP mode based on + the <a href="../clike/">C-like</a> mode. Depends on XML, + JavaScript, CSS, and C-like modes.</p> + + <p><strong>MIME types defined:</strong> <code>application/x-httpd-php</code>.</p> + </body> +</html> Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/php/php.js =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/php/php.js (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/php/php.js 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,83 @@ +(function() { + function keywords(str) { + var obj = {}, words = str.split(" "); + for (var i = 0; i < words.length; ++i) obj[words[i]] = true; + return obj; + } + var phpKeywords = + keywords("abstract and array as break case catch cfunction class clone const continue declare " + + "default do else elseif enddeclare endfor endforeach endif endswitch endwhile extends " + + "final for foreach function global goto if implements interface instanceof namespace " + + "new or private protected public static switch throw try use var while xor"); + + CodeMirror.defineMode("php", function(config, parserConfig) { + var htmlMode = CodeMirror.getMode(config, "text/html"); + var jsMode = CodeMirror.getMode(config, "text/javascript"); + var cssMode = CodeMirror.getMode(config, "text/css"); + var phpMode = CodeMirror.getMode(config, {name: "clike", keywords: phpKeywords, multiLineStrings: true, $vars: true}); + + function dispatch(stream, state) { // TODO open PHP inside text/css + if (state.curMode == htmlMode) { + var style = htmlMode.token(stream, state.curState); + if (style == "xml-processing" && /^<\?/.test(stream.current())) { + state.curMode = phpMode; + state.curState = state.php; + state.curClose = /^\?>/; + } + else if (style == "xml-tag" && stream.current() == ">" && state.curState.context) { + if (/^script$/i.test(state.curState.context.tagName)) { + state.curMode = jsMode; + state.curState = jsMode.startState(htmlMode.indent(state.curState, "")); + state.curClose = /^<\/\s*script\s*>/i; + } + else if (/^style$/i.test(state.curState.context.tagName)) { + state.curMode = cssMode; + state.curState = cssMode.startState(htmlMode.indent(state.curState, "")); + state.curClose = /^<\/\s*style\s*>/i; + } + } + return style; + } + else if (stream.match(state.curClose, false)) { + state.curMode = htmlMode; + state.curState = state.html; + state.curClose = null; + return dispatch(stream, state); + } + else return state.curMode.token(stream, state.curState); + } + + return { + startState: function() { + var html = htmlMode.startState(); + return {html: html, + php: phpMode.startState(), + curMode: htmlMode, + curState: html, + curClose: null} + }, + + copyState: function(state) { + var html = state.html, htmlNew = CodeMirror.copyState(htmlMode, html), + php = state.php, phpNew = CodeMirror.copyState(phpMode, php), cur; + if (state.curState == html) cur = htmlNew; + else if (state.curState == php) cur = phpNew; + else cur = CodeMirror.copyState(state.curMode, state.curState); + return {html: htmlNew, php: phpNew, curMode: state.curMode, curState: cur, curClose: state.curClose}; + }, + + token: dispatch, + + indent: function(state, textAfter) { + if ((state.curMode != phpMode && /^\s*<\//.test(textAfter)) || + (state.curMode == phpMode && /^\?>/.test(textAfter))) + return htmlMode.indent(state.html, textAfter); + return state.curMode.indent(state.curState, textAfter); + }, + + electricChars: "/{}:" + } + }); +})(); + +CodeMirror.defineMIME("application/x-httpd-php", "php"); Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/stex/index.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/stex/index.html (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/stex/index.html 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,96 @@ +<!doctype html> +<html> + <head> + <title>CodeMirror 2: sTeX mode</title> + <link rel="stylesheet" href="../../lib/codemirror.css"> + <script src="../../lib/codemirror.js"></script> + <script src="stex.js"></script> + <link rel="stylesheet" href="stex.css"> + <style>.CodeMirror {background: #f8f8f8;}</style> + <link rel="stylesheet" href="../../css/docs.css"> + </head> + <body> + <h1>CodeMirror 2: sTeX mode</h1> + <form><textarea id="code" name="code"> +\begin{module}[id=bbt-size] +\importmodule[balanced-binary-trees]{balanced-binary-trees} +\importmodule[\KWARCslides{dmath/en/cardinality}]{cardinality} + +\begin{frame} + \frametitle{Size Lemma for Balanced Trees} + \begin{itemize} + \item + \begin{assertion}[id=size-lemma,type=lemma] + Let $G=\tup{V,E}$ be a \termref[cd=binary-trees]{balanced binary tree} + of \termref[cd=graph-depth,name=vertex-depth]{depth}$n>i$, then the set + $\defeq{\livar{V}i}{\setst{\inset{v}{V}}{\gdepth{v} = i}}$ of + \termref[cd=graphs-intro,name=node]{nodes} at + \termref[cd=graph-depth,name=vertex-depth]{depth} $i$ has + \termref[cd=cardinality,name=cardinality]{cardinality} $\power2i$. + \end{assertion} + \item + \begin{sproof}[id=size-lemma-pf,proofend=,for=size-lemma]{via induction over the depth $i$.} + \begin{spfcases}{We have to consider two cases} + \begin{spfcase}{$i=0$} + \begin{spfstep}[display=flow] + then $\livar{V}i=\set{\livar{v}r}$, where $\livar{v}r$ is the root, so + $\eq{\card{\livar{V}0},\card{\set{\livar{v}r}},1,\power20}$. + \end{spfstep} + \end{spfcase} + \begin{spfcase}{$i>0$} + \begin{spfstep}[display=flow] + then $\livar{V}{i-1}$ contains $\power2{i-1}$ vertexes + \begin{justification}[method=byIH](IH)\end{justification} + \end{spfstep} + \begin{spfstep} + By the \begin{justification}[method=byDef]definition of a binary + tree\end{justification}, each $\inset{v}{\livar{V}{i-1}}$ is a leaf or has + two children that are at depth $i$. + \end{spfstep} + \begin{spfstep} + As $G$ is \termref[cd=balanced-binary-trees,name=balanced-binary-tree]{balanced} and $\gdepth{G}=n>i$, $\livar{V}{i-1}$ cannot contain + leaves. + \end{spfstep} + \begin{spfstep}[type=conclusion] + Thus $\eq{\card{\livar{V}i},{\atimes[cdot]{2,\card{\livar{V}{i-1}}}},{\atimes[cdot]{2,\power2{i-1}}},\power2i}$. + \end{spfstep} + \end{spfcase} + \end{spfcases} + \end{sproof} + \item + \begin{assertion}[id=fbbt,type=corollary] + A fully balanced tree of depth $d$ has $\power2{d+1}-1$ nodes. + \end{assertion} + \item + \begin{sproof}[for=fbbt,id=fbbt-pf]{} + \begin{spfstep} + Let $\defeq{G}{\tup{V,E}}$ be a fully balanced tree + \end{spfstep} + \begin{spfstep} + Then $\card{V}=\Sumfromto{i}1d{\power2i}= \power2{d+1}-1$. + \end{spfstep} + \end{sproof} + \end{itemize} + \end{frame} +\begin{note} + \begin{omtext}[type=conclusion,for=binary-tree] + This shows that balanced binary trees grow in breadth very quickly, a consequence of + this is that they are very shallow (and this compute very fast), which is the essence of + the next result. + \end{omtext} +\end{note} +\end{module} + +%%% Local Variables: +%%% mode: LaTeX +%%% TeX-master: "all" +%%% End: \end{document} +</textarea></form> + <script> + var editor = CodeMirror.fromTextArea(document.getElementById("code"), {}); + </script> + + <p><strong>MIME types defined:</strong> <code>text/stex</code>.</p> + + </body> +</html> Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/stex/stex.css =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/stex/stex.css (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/stex/stex.css 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,20 @@ +span.css-at {color: #708;} +span.css-unit {color: #281;} +span.css-value {color: #708;} +span.css-identifier {color: black;} +span.css-selector {color: #11B;} +span.css-important {color: #00F;} +span.css-colorcode {color: #299;} +span.css-comment {color: #A70;} +span.css-string {color: #A22;} + +span.stex-unit { color: #281; } +span.stex-identifier { color: black; } +span.stex-slash { color: #FAA; } +span.stex-command { color: #00F; } +span.stex-comment { color: #A70; } +span.stex-import { color: #00F; } +span.stex-filepath { color: #852626; } +span.stex-module { color: #852626; } +span.stex-error { text-decoration: underline; color: red; } +span.stex-string { color: #A22; } Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/stex/stex.js =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/stex/stex.js (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/stex/stex.js 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,167 @@ +/* + * Author: Constantin Jucovschi (c.jucovschi(a)jacobs-university.de) + * Licence: MIT + */ + +CodeMirror.defineMode("stex", function(cmCfg, modeCfg) +{ + function pushCommand(state, command) { + state.cmdState.push(command); + } + + function peekCommand(state) { + if (state.cmdState.length>0) + return state.cmdState[state.cmdState.length-1]; + else + return null; + } + + function popCommand(state) { + if (state.cmdState.length>0) { + var plug = state.cmdState.pop(); + plug.closeBracket(); + } + } + + function applyMostPowerful(state) { + context = state.cmdState; + for (var i = context.length - 1; i >= 0; i--) { + var plug = context[i]; + if (plug.name=="DEFAULT") + continue; + return plug.styleIdentifier(); + } + return "stex-identifier"; + } + + function addPluginPattern(pluginName, cmdStyle, brackets, styles) { + return function () { + this.name=pluginName; + this.bracketNo = 0; + this.style=cmdStyle; + this.styles = styles; + this.brackets = brackets; + + this.styleIdentifier = function(content) { + if (this.bracketNo<=this.styles.length) + return this.styles[this.bracketNo-1]; + else + return null; + }; + this.openBracket = function(content) { + this.bracketNo++; + return "stex-bracket"; + }; + this.closeBracket = function(content) { + }; + } + } + + var plugins = new Array(); + + plugins["importmodule"] = addPluginPattern("importmodule", "stex-command", "{[", ["stex-filepath", "stex-module"]); + plugins["documentclass"] = addPluginPattern("documentclass", "stex-command", "{[", ["", "stex-unit"]); + plugins["usepackage"] = addPluginPattern("documentclass", "stex-command", "[", ["stex-unit"]); + plugins["begin"] = addPluginPattern("documentclass", "stex-command", "[", ["stex-unit"]); + plugins["end"] = addPluginPattern("documentclass", "stex-command", "[", ["stex-unit"]); + + plugins["DEFAULT"] = function () { + this.name="DEFAULT"; + this.style="stex-command"; + + this.styleIdentifier = function(content) { + }; + this.openBracket = function(content) { + }; + this.closeBracket = function(content) { + }; + }; + + function setState(state, f) { + state.f = f; + } + + function normal(source, state) { + if (source.match(/^\\[a-z]+/)) { + cmdName = source.current(); + cmdName = cmdName.substr(1, cmdName.length-1); + var plug = plugins[cmdName]; + if (typeof(plug) == 'undefined') { + plug = plugins["DEFAULT"]; + } + plug = new plug(); + pushCommand(state, plug); + setState(state, beginParams); + return plug.style; + } + + var ch = source.next(); + if (ch == "%") { + setState(state, inCComment); + return "stex-comment"; + } + else if (ch=='}' || ch==']') { + plug = peekCommand(state); + if (plug) { + plug.closeBracket(ch); + setState(state, beginParams); + } else + return "stex-error"; + return "stex-bracket"; + } else if (ch=='{' || ch=='[') { + plug = plugins["DEFAULT"]; + plug = new plug(); + pushCommand(state, plug); + return "stex-bracket"; + } + else if (/\d/.test(ch)) { + source.eatWhile(/[\w.%]/); + return "stex-unit"; + } + else { + source.eatWhile(/[\w-_]/); + return applyMostPowerful(state); + } + } + + function inCComment(source, state) { + source.skipToEnd(); + setState(state, normal); + return "css-comment"; + } + + function beginParams(source, state) { + var ch = source.peek(); + if (ch == '{' || ch == '[') { + lastPlug = peekCommand(state); + style = lastPlug.openBracket(ch); + source.eat(ch); + setState(state, normal); + return "stex-bracket"; + } + if (/[ \t\r]/.test(ch)) { + source.eat(ch); + return null; + } + setState(state, normal); + lastPlug = peekCommand(state); + if (lastPlug) { + popCommand(state); + } + return normal(source, state); + } + + return { + startState: function() { return { f:normal, cmdState:[] }; }, + copyState: function(s) { return { f: s.f, cmdState: s.cmdState.slice(0, s.cmdState.length) }; }, + + token: function(stream, state) { + var t = state.f(stream, state); + var w = stream.current(); + return t; + } + }; +}); + + +CodeMirror.defineMIME("text/x-stex", "stex"); Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/xml/index.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/xml/index.html (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/xml/index.html 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,42 @@ +<!doctype html> +<html> + <head> + <title>CodeMirror 2: XML mode</title> + <link rel="stylesheet" href="../../lib/codemirror.css"> + <script src="../../lib/codemirror.js"></script> + <script src="xml.js"></script> + <link rel="stylesheet" href="xml.css"> + <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style> + <link rel="stylesheet" href="../../css/docs.css"> + </head> + <body> + <h1>CodeMirror 2: XML mode</h1> + <form><textarea id="code" name="code"> +<html style="color: green"> +  + <head> + <title>HTML Example</title> + </head> + <body> + The indentation tries to be <em>somewhat &quot;do what + I mean&quot;</em>... but might not match your style. + </body> +</html> +</textarea></form> + <script> + var editor = CodeMirror.fromTextArea(document.getElementById("code"), {mode: {name: "xml", htmlMode: true}}); + </script> + <p>The XML mode supports two configuration parameters:</p> + <dl> + <dt><code>htmlMode (boolean)</code></dt> + <dd>This switches the mode to parse HTML instead of XML. This + means attributes do not have to be quoted, and some elements + (such as <code>br</code>) do not require a closing tag.</dd> + <dt><code>alignCDATA (boolean)</code></dt> + <dd>Setting this to true will force the opening tag of CDATA + blocks to not be indented.</dd> + </dl> + + <p><strong>MIME types defined:</strong> <code>application/xml</code>, <code>text/html</code>.</p> + </body> +</html> Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/xml/xml.css =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/xml/xml.css (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/xml/xml.css 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,7 @@ +span.xml-tag {color: #a0b;} +span.xml-attribute {color: #281;} +span.xml-attname {color: #00f;} +span.xml-comment {color: #a70;} +span.xml-cdata {color: #48a;} +span.xml-processing {color: #999;} +span.xml-entity {color: #a22;} Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/xml/xml.js =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/xml/xml.js (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/mode/xml/xml.js 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,206 @@ +CodeMirror.defineMode("xml", function(config, parserConfig) { + var indentUnit = config.indentUnit; + var Kludges = parserConfig.htmlMode ? { + autoSelfClosers: {"br": true, "img": true, "hr": true, "link": true, "input": true, + "meta": true, "col": true, "frame": true, "base": true, "area": true}, + doNotIndent: {"pre": true, "!cdata": true}, + allowUnquoted: true + } : {autoSelfClosers: {}, doNotIndent: {"!cdata": true}, allowUnquoted: false}; + var alignCDATA = parserConfig.alignCDATA; + + // Return variables for tokenizers + var tagName, type; + + function inText(stream, state) { + function chain(parser) { + state.tokenize = parser; + return parser(stream, state); + } + + var ch = stream.next(); + if (ch == "<") { + if (stream.eat("!")) { + if (stream.eat("[")) { + if (stream.match("[CDATA[")) return chain(inBlock("xml-cdata", "]]>")); + else return null; + } + else if (stream.match("--")) return chain(inBlock("xml-comment", "-->")); + else if (stream.match("DOCTYPE")) { + stream.eatWhile(/[\w\._\-]/); + return chain(inBlock("xml-doctype", ">")); + } + else return null; + } + else if (stream.eat("?")) { + stream.eatWhile(/[\w\._\-]/); + state.tokenize = inBlock("xml-processing", "?>"); + return "xml-processing"; + } + else { + type = stream.eat("/") ? "closeTag" : "openTag"; + stream.eatSpace(); + tagName = ""; + var c; + while ((c = stream.eat(/[^\s\u00a0=<>\"\'\/?]/))) tagName += c; + state.tokenize = inTag; + return "xml-tag"; + } + } + else if (ch == "&") { + stream.eatWhile(/[^;]/); + stream.eat(";"); + return "xml-entity"; + } + else { + stream.eatWhile(/[^&<]/); + return null; + } + } + + function inTag(stream, state) { + var ch = stream.next(); + if (ch == ">" || (ch == "/" && stream.eat(">"))) { + state.tokenize = inText; + type = ch == ">" ? "endTag" : "selfcloseTag"; + return "xml-tag"; + } + else if (ch == "=") { + type = "equals"; + return null; + } + else if (/[\'\"]/.test(ch)) { + state.tokenize = inAttribute(ch); + return state.tokenize(stream, state); + } + else { + stream.eatWhile(/[^\s\u00a0=<>\"\'\/?]/); + return "xml-word"; + } + } + + function inAttribute(quote) { + return function(stream, state) { + while (!stream.eol()) { + if (stream.next() == quote) { + state.tokenize = inTag; + break; + } + } + return "xml-attribute"; + }; + } + + function inBlock(style, terminator) { + return function(stream, state) { + while (!stream.eol()) { + if (stream.match(terminator)) { + state.tokenize = inText; + break; + } + stream.next(); + } + return style; + }; + } + + var curState, setStyle; + function pass() { + for (var i = arguments.length - 1; i >= 0; i--) curState.cc.push(arguments[i]); + } + function cont() { + pass.apply(null, arguments); + return true; + } + + function pushContext(tagName, startOfLine) { + var noIndent = Kludges.doNotIndent.hasOwnProperty(tagName) || (curState.context && curState.context.noIndent); + curState.context = { + prev: curState.context, + tagName: tagName, + indent: curState.indented, + startOfLine: startOfLine, + noIndent: noIndent + }; + } + function popContext() { + if (curState.context) curState.context = curState.context.prev; + } + + function element(type) { + if (type == "openTag") {curState.tagName = tagName; return cont(attributes, endtag(curState.startOfLine));} + else if (type == "closeTag") {popContext(); return cont(endclosetag);} + else if (type == "xml-cdata") { + if (!curState.context || curState.context.name != "!cdata") pushContext("!cdata"); + if (curState.tokenize == inText) popContext(); + return cont(); + } + else return cont(); + } + function endtag(startOfLine) { + return function(type) { + if (type == "selfcloseTag" || + (type == "endTag" && Kludges.autoSelfClosers.hasOwnProperty(curState.tagName.toLowerCase()))) + return cont(); + if (type == "endTag") {pushContext(curState.tagName, startOfLine); return cont();} + return cont(); + }; + } + function endclosetag(type) { + if (type == "endTag") return cont(); + return pass(); + } + + function attributes(type) { + if (type == "xml-word") {setStyle = "xml-attname"; return cont(attributes);} + if (type == "equals") return cont(attvalue, attributes); + return pass(); + } + function attvalue(type) { + if (type == "xml-word" && Kludges.allowUnquoted) {setStyle = "xml-attribute"; return cont();} + if (type == "xml-attribute") return cont(); + return pass(); + } + + return { + startState: function() { + return {tokenize: inText, cc: [], indented: 0, startOfLine: true, tagName: null, context: null}; + }, + + token: function(stream, state) { + if (stream.sol()) { + state.startOfLine = true; + state.indented = stream.indentation(); + } + if (stream.eatSpace()) return null; + + setStyle = type = tagName = null; + var style = state.tokenize(stream, state); + if ((style || type) && style != "xml-comment") { + curState = state; + while (true) { + var comb = state.cc.pop() || element; + if (comb(type || style)) break; + } + } + state.startOfLine = false; + return setStyle || style; + }, + + indent: function(state, textAfter) { + var context = state.context; + if (context && context.noIndent) return 0; + if (alignCDATA && /<!\[CDATA\[/.test(textAfter)) return 0; + if (context && /^<\//.test(textAfter)) + context = context.prev; + while (context && !context.startOfLine) + context = context.prev; + if (context) return context.indent + indentUnit; + else return 0; + }, + + electricChars: "/" + }; +}); + +CodeMirror.defineMIME("application/xml", "xml"); +CodeMirror.defineMIME("text/html", {name: "xml", htmlMode: true}); Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/oldrelease.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/oldrelease.html (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/oldrelease.html 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,116 @@ +<!doctype html> +<html> + <head> + <title>CodeMirror</title> + <link rel="stylesheet" type="text/css" href="css/docs.css"/> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> + <link rel="alternate" href="http://twitter.com/statuses/user_timeline/242283288.rss" type="application/rss+xml"/> + </head> + <body> + +<h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMirror</a></h1> + +<pre class="grey"> +<img src="css/baboon.png" class="logo" alt="logo"/>/* Old release history */ + +</pre> + + <p class="rel">02-10-2010: <a + href="http://codemirror.net/codemirror-0.9.zip">Version 0.9</a>:</p> + <ul class="rel-note"> + <li>Add support for searching backwards.</li> + <li>There are now parsers for <a href="contrib/scheme/index.html">Scheme</a>, <a href="contrib/xquery/index.html">XQuery</a>, and <a href="contrib/ometa/index.html">OmetaJS</a>.</li> + <li>Makes <code>height: "dynamic"</code> more robust.</li> + <li>Fixes bug where paste did not work on OS X.</li> + <li>Add a <code>enterMode</code> and <code>electricChars</code> options to make indentation even more customizable.</li> + <li>Add <code>firstLineNumber</code> option.</li> + <li>Fix bad handling of <code>@media</code> rules by the CSS parser.</li> + <li>Take a new, more robust approach to working around the invisible-last-line bug in WebKit.</li> + </ul> + + <p class="rel">22-07-2010: <a + href="http://codemirror.net/codemirror-0.8.zip">Version 0.8</a>:</p> + <ul class="rel-note"> + <li>Add a <code>cursorCoords</code> method to find the screen + coordinates of the cursor.</li> + <li>A number of fixes and support for more syntax in the PHP parser.</li> + <li>Fix indentation problem with JSON-mode JS parser in Webkit.</li> + <li>Add a <a href="compress.html">minification</a> UI.</li> + <li>Support a <code>height: dynamic</code> mode, where the editor's + height will adjust to the size of its content.</li> + <li>Better support for IME input mode.</li> + <li>Fix JavaScript parser getting confused when seeing a no-argument + function call.</li> + <li>Have CSS parser see the difference between selectors and other + identifiers.</li> + <li>Fix scrolling bug when pasting in a horizontally-scrolled + editor.</li> + <li>Support <code>toTextArea</code> method in instances created with + <code>fromTextArea</code>.</li> + <li>Work around new Opera cursor bug that causes the cursor to jump + when pressing backspace at the end of a line.</li> + </ul> + + <p class="rel">27-04-2010: <a + href="http://codemirror.net/codemirror-0.67.zip">Version + 0.67</a>:</p> + <p class="rel-note">More consistent page-up/page-down behaviour + across browsers. Fix some issues with hidden editors looping forever + when line-numbers were enabled. Make PHP parser parse + <code>"\\"</code> correctly. Have <code>jumpToLine</code> work on + line handles, and add <code>cursorLine</code> function to fetch the + line handle where the cursor currently is. Add new + <code>setStylesheet</code> function to switch style-sheets in a + running editor.</p> + + <p class="rel">01-03-2010: <a + href="http://codemirror.net/codemirror-0.66.zip">Version + 0.66</a>:</p> + <p class="rel-note">Adds <code>removeLine</code> method to API. + Introduces the <a href="contrib/plsql/index.html">PLSQL parser</a>. + Marks XML errors by adding (rather than replacing) a CSS class, so + that they can be disabled by modifying their style. Fixes several + selection bugs, and a number of small glitches.</p> + + <p class="rel">12-11-2009: <a + href="http://codemirror.net/codemirror-0.65.zip">Version + 0.65</a>:</p> + <p class="rel-note">Add support for having both line-wrapping and + line-numbers turned on, make paren-highlighting style customisable + (<code>markParen</code> and <code>unmarkParen</code> config + options), work around a selection bug that Opera + <em>re</em>introduced in version 10.</p> + + <p class="rel">23-10-2009: <a + href="http://codemirror.net/codemirror-0.64.zip">Version + 0.64</a>:</p> + <p class="rel-note">Solves some issues introduced by the + paste-handling changes from the previous release. Adds + <code>setSpellcheck</code>, <code>setTextWrapping</code>, + <code>setIndentUnit</code>, <code>setUndoDepth</code>, + <code>setTabMode</code>, and <code>setLineNumbers</code> to + customise a running editor. Introduces an <a + href="contrib/sql/index.html">SQL</a> parser. Fixes a few small + problems in the <a href="contrib/python/index.html">Python</a> + parser. And, as usual, add workarounds for various newly discovered + browser incompatibilities.</p> + +<p class="rel"><em>31-08-2009</em>: <a +href="http://codemirror.net/codemirror-0.63.zip">Version +0.63</a>:</p> +<p class="rel-note"> Overhaul of paste-handling (less fragile), fixes for several +serious IE8 issues (cursor jumping, end-of-document bugs) and a number +of small problems.</p> + +<p class="rel"><em>30-05-2009</em>: <a +href="http://codemirror.net/codemirror-0.62.zip">Version +0.62</a>:</p> +<p class="rel-note">Introduces <a href="contrib/python/index.html">Python</a> +and <a href="contrib/lua/index.html">Lua</a> parsers. Add +<code>setParser</code> (on-the-fly mode changing) and +<code>clearHistory</code> methods. Make parsing passes time-based +instead of lines-based (see the <code>passTime</code> option).</p> + + <script type="text/javascript" src="css/font.js"></script> + +</body></html> Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/test/index.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/test/index.html (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/test/index.html 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,30 @@ +<!doctype html> +<html> + <head> + <title>CodeMirror 2: Test Suite</title> + <link rel="stylesheet" href="../lib/codemirror.css"> + <script src="../lib/codemirror.js"></script> + <link rel="stylesheet" href="../mode/javascript/javascript.css"> + <script src="../mode/javascript/javascript.js"></script> + + <link rel="stylesheet" href="../docs.css"> + <style type="text/css"> + .ok {color: #0e0;} + .failure {color: #e00;} + .error {color: #c90;} + </style> + </head> + <body> + <h1>CodeMirror 2: Test Suite</h1> + + <p>A limited set of programmatic sanity tests for CodeMirror.</p> + + <pre id=output></pre> + + <div style="visibility: hidden" id=testground> + <form><textarea id="code" name="code"></textarea><input type=submit value=ok name=submit></form> + </div> + + <script src="test.js"></script> + </body> +</html> Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/test/test.js =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/test/test.js (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.0/test/test.js 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,234 @@ +var tests = []; + +test("fromTextArea", function() { + var te = document.getElementById("code"); + te.value = "CONTENT"; + var cm = CodeMirror.fromTextArea(te); + is(!te.offsetHeight); + eq(cm.getValue(), "CONTENT"); + cm.setValue("foo\nbar"); + eq(cm.getValue(), "foo\nbar"); + cm.save(); + is(/^foo\r?\nbar$/.test(te.value)); + cm.setValue("xxx"); + cm.toTextArea(); + is(te.offsetHeight); + eq(te.value, "xxx"); +}); + +testCM("getRange", function(cm) { + eq(cm.getLine(0), "1234"); + eq(cm.getLine(1), "5678"); + eq(cm.getLine(2), null); + eq(cm.getLine(-1), null); + eq(cm.getRange({line: 0, ch: 0}, {line: 0, ch: 3}), "123"); + eq(cm.getRange({line: 0, ch: -1}, {line: 0, ch: 200}), "1234"); + eq(cm.getRange({line: 0, ch: 2}, {line: 1, ch: 2}), "34\n56"); + eq(cm.getRange({line: 1, ch: 2}, {line: 100, ch: 0}), "78"); +}, {value: "1234\n5678"}); + +testCM("replaceRange", function(cm) { + eq(cm.getValue(), ""); + cm.replaceRange("foo\n", {line: 0, ch: 0}); + eq(cm.getValue(), "foo\n"); + cm.replaceRange("a\nb", {line: 0, ch: 1}); + eq(cm.getValue(), "fa\nboo\n"); + eq(cm.lineCount(), 3); + cm.replaceRange("xyzzy", {line: 0, ch: 0}, {line: 1, ch: 1}); + eq(cm.getValue(), "xyzzyoo\n"); + cm.replaceRange("abc", {line: 0, ch: 0}, {line: 10, ch: 0}); + eq(cm.getValue(), "abc"); + eq(cm.lineCount(), 1); +}); + +testCM("selection", function(cm) { + cm.setSelection({line: 0, ch: 4}, {line: 2, ch: 2}); + is(cm.somethingSelected()); + eq(cm.getSelection(), "11\n222222\n33"); + eqPos(cm.getCursor(false), {line: 2, ch: 2}); + eqPos(cm.getCursor(true), {line: 0, ch: 4}); + cm.setSelection({line: 1, ch: 0}); + is(!cm.somethingSelected()); + eq(cm.getSelection(), ""); + eqPos(cm.getCursor(true), {line: 1, ch: 0}); + cm.replaceSelection("abc"); + eq(cm.getSelection(), "abc"); + eq(cm.getValue(), "111111\nabc222222\n333333"); + cm.replaceSelection("def", "end"); + eq(cm.getSelection(), ""); + eqPos(cm.getCursor(true), {line: 1, ch: 3}); + cm.setCursor({line: 2, ch: 1}); + eqPos(cm.getCursor(true), {line: 2, ch: 1}); + cm.setCursor(1, 2); + eqPos(cm.getCursor(true), {line: 1, ch: 2}); +}, {value: "111111\n222222\n333333"}); + +testCM("lines", function(cm) { + eq(cm.getLine(0), "111111"); + eq(cm.getLine(1), "222222"); + eq(cm.getLine(-1), null); + cm.removeLine(1); + cm.setLine(1, "abc"); + eq(cm.getValue(), "111111\nabc"); +}, {value: "111111\n222222\n333333"}); + +testCM("indent", function(cm) { + cm.indentLine(1); + eq(cm.getLine(1), " blah();"); + cm.setOption("indentUnit", 8); + cm.indentLine(1); + eq(cm.getLine(1), "\tblah();"); +}, {value: "if (x) {\nblah();\n}", indentUnit: 3, indentWithTabs: true}); + +test("defaults", function() { + var olddefaults = CodeMirror.defaults, defs = CodeMirror.defaults = {}; + for (var opt in olddefaults) defs[opt] = olddefaults[opt]; + defs.indentUnit = 5; + defs.value = "uu"; + defs.enterMode = "keep"; + defs.tabindex = 55; + var place = document.getElementById("testground"), cm = CodeMirror(place); + try { + eq(cm.getOption("indentUnit"), 5); + cm.setOption("indentUnit", 10); + eq(defs.indentUnit, 5); + eq(cm.getValue(), "uu"); + eq(cm.getOption("enterMode"), "keep"); + eq(cm.getInputField().tabindex, 55); + } + finally { + CodeMirror.defaults = olddefaults; + place.removeChild(cm.getWrapperElement()); + } +}); + +testCM("lineInfo", function(cm) { + eq(cm.lineInfo(-1), null); + var lh = cm.setMarker(1, "FOO", "bar"); + var info = cm.lineInfo(1); + eq(info.text, "222222"); + eq(info.markerText, "FOO"); + eq(info.markerClass, "bar"); + eq(info.line, 1); + eq(cm.lineInfo(2).markerText, null); + cm.clearMarker(lh); + eq(cm.lineInfo(1).markerText, null); +}, {value: "111111\n222222\n333333"}); + +testCM("coords", function(cm) { + cm.getWrapperElement().style.height = "100px"; + var content = []; + for (var i = 0; i < 200; ++i) content.push("------------------------------" + i); + cm.setValue(content.join("\n")); + var top = cm.charCoords({line: 0, ch: 0}); + var bot = cm.charCoords({line: 200, ch: 30}); + is(top.x < bot.x); + is(top.y < bot.y); + is(top.y < top.yBot); + cm.getWrapperElement().scrollTop = 100; + cm.refresh(); + var top2 = cm.charCoords({line: 0, ch: 0}); + is(top.y > top2.y); + eq(top.x, top2.x); +}); + +testCM("undo", function(cm) { + cm.setLine(0, "def"); + eq(cm.historySize().undo, 1); + cm.undo(); + eq(cm.getValue(), "abc"); + eq(cm.historySize().undo, 0); + eq(cm.historySize().redo, 1); + cm.redo(); + eq(cm.getValue(), "def"); + eq(cm.historySize().undo, 1); + eq(cm.historySize().redo, 0); + cm.setValue("1\n\n\n2"); + eq(cm.historySize().undo, 0); + for (var i = 0; i < 20; ++i) { + cm.replaceRange("a", {line: 0, ch: 0}); + cm.replaceRange("b", {line: 3, ch: 0}); + } + eq(cm.historySize().undo, 40); + for (var i = 0; i < 38; ++i) cm.undo(); + eq(cm.historySize().undo, 2); + eq(cm.historySize().redo, 38); + eq(cm.getValue(), "a1\n\n\nb2"); + cm.setOption("undoDepth", 10); + for (var i = 0; i < 20; ++i) { + cm.replaceRange("a", {line: 0, ch: 0}); + cm.replaceRange("b", {line: 3, ch: 0}); + } + eq(cm.historySize().undo, 10); +}, {value: "abc"}); + +testCM("undoMultiLine", function(cm) { + cm.replaceRange("x", {line:0, ch: 0}); + cm.replaceRange("y", {line:1, ch: 0}); + cm.undo(); + eq(cm.getValue(), "abc\ndef\nghi"); + cm.replaceRange("y", {line:1, ch: 0}); + cm.replaceRange("x", {line:0, ch: 0}); + cm.undo(); + eq(cm.getValue(), "abc\ndef\nghi"); + cm.replaceRange("y", {line:2, ch: 0}); + cm.replaceRange("x", {line:1, ch: 0}); + cm.replaceRange("z", {line:2, ch: 0}); + cm.undo(); + eq(cm.getValue(), "abc\ndef\nghi"); +}, {value: "abc\ndef\nghi"}); + +// Scaffolding + +function htmlEscape(str) { + return str.replace(/[<&]/g, function(str) {return str == "&" ? "&" : "<";}); +} +function forEach(arr, f) { + for (var i = 0, e = arr.length; i < e; ++i) f(arr[i]); +} + +function Failure(why) {this.message = why;} + +function test(name, run) {tests.push({name: name, func: run});} +function testCM(name, run, opts) { + test(name, function() { + var place = document.getElementById("testground"), cm = CodeMirror(place, opts); + try {run(cm);} + finally {place.removeChild(cm.getWrapperElement());} + }); +} + +function runTests() { + var failures = [], run = 0; + for (var i = 0; i < tests.length; ++i) { + var test = tests[i]; + try {test.func();} + catch(e) { + if (e instanceof Failure) + failures.push({type: "failure", test: test.name, text: e.message}); + else + failures.push({type: "error", test: test.name, text: e.toString()}); + } + run++; + } + var html = [run + " tests run."]; + if (failures.length) + forEach(failures, function(fail) { + html.push(fail.test + ': <span class="' + fail.type + '">' + htmlEscape(fail.text) + "</span>"); + }); + else html.push('<span class="ok">All passed.</span>'); + document.getElementById("output").innerHTML = html.join("\n"); +} + +function eq(a, b, msg) { + if (a != b) throw new Failure(a + " != " + b + (msg ? " (" + msg + ")" : "")); +} +function eqPos(a, b, msg) { + eq(a.line, b.line, msg); + eq(a.ch, b.ch, msg); +} +function is(a, msg) { + if (!a) throw new Failure("assertion failed" + (msg ? " (" + msg + ")" : "")); +} + +window.onload = runTests; Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/LICENSE =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/LICENSE (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/LICENSE 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,19 @@ +Copyright (C) 2011 by Marijn Haverbeke <marijnh(a)gmail.com> + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/README.md =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/README.md (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/README.md 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,6 @@ +# CodeMirror 2 + +CodeMirror 2 is a rewrite of [CodeMirror +1](http://github.com/marijnh/CodeMirror). The docs live +[here](http://codemirror.net/2/manual.html), and the project page is +[http://codemirror.net/2/](http://codemirror.net/2/). Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/compress.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/compress.html (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/compress.html 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,87 @@ +<!doctype html> +<html> + <head> + <title>CodeMirror: Compression Helper</title> + <link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Droid+Sans|Droid+Sans:bold"/> + <link rel="stylesheet" type="text/css" href="css/docs.css"/> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> + </head> + <body> + +<h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMirror</a></h1> + +<pre class="grey"> +<img src="css/baboon.png" class="logo" alt="logo"/>/* Script compression + helper */ +</pre> + + <p>To optimize loading CodeMirror, especially when including a + bunch of different modes, it is recommended that you combine and + minify (and preferably also gzip) the scripts. This page makes + those first two steps very easy. Simply select the version and + scripts you need in the form below, and + click <strong>Compress</strong> to download the minified script + file.</p> + + <form id="form" action="http://marijnhaverbeke.nl/uglifyjs" method="post"> + <input type="hidden" id="download" name="download" value="codemirror-compressed.js"/> + <p>Version: <select id="version" onchange="setVersion(this);" style="padding: 1px"> + <option value="http://codemirror.net/">HEAD</option> + <option value="http://marijnhaverbeke.nl/git/codemirror2?a=blob_plain;hb=v2.1;f=">2.1</option> + <option value="http://marijnhaverbeke.nl/git/codemirror2?a=blob_plain;hb=v2.02;f=">2.02</option> + <option value="http://marijnhaverbeke.nl/git/codemirror2?a=blob_plain;hb=v2.01;f=">2.01</option> + <option value="http://marijnhaverbeke.nl/git/codemirror2?a=blob_plain;hb=v2.0;f=">2.0</option> + <option value="http://marijnhaverbeke.nl/git/codemirror2?a=blob_plain;hb=beta2;f=">beta2</option> + <option value="http://marijnhaverbeke.nl/git/codemirror2?a=blob_plain;hb=beta1;f=">beta1</option> + </select></p> + + <select multiple="multiple" name="code_url" style="width: 40em;" class="field" id="files"> + <optgroup label="CodeMirror Library"> + <option value="http://codemirror.net/lib/codemirror.js" selected>codemirror.js</option> + <option value="http://codemirror.net/lib/overlay.js">overlay.js</option> + <option value="http://codemirror.net/lib/runmode.js">runmode.js</option> + </optgroup> + <optgroup label="Modes"> + <option value="http://codemirror.net/mode/javascript/javascript.js">javascript.js</option> + <option value="http://codemirror.net/mode/xml/xml.js">xml.js</option> + <option value="http://codemirror.net/mode/css/css.js">css.js</option> + <option value="http://codemirror.net/mode/htmlmixed/htmlmixed.js">htmlmixed.js</option> + <option value="http://codemirror.net/mode/clike/clike.js">clike.js</option> + <option value="http://codemirror.net/mode/python/python.js">python.js</option> + <option value="http://codemirror.net/mode/php/php.js">php.js</option> + <option value="http://codemirror.net/mode/haskell/haskell.js">haskell.js</option> + <option value="http://codemirror.net/mode/diff/diff.js">diff.js</option> + <option value="http://codemirror.net/mode/stex/stex.js">stex.js</option> + <option value="http://codemirror.net/mode/smalltalk/smalltalk.js">smalltalk.js</option> + <option value="http://codemirror.net/mode/rst/rst.js">rst.js</option> + <option value="http://codemirror.net/mode/plsql/plsql.js">plsql.js</option> + <option value="http://codemirror.net/mode/lua/lua.js">lua.js</option> + </optgroup> + </select></p> + + <p> + <button type="submit">Compress</button> with <a href="http://github.com/mishoo/UglifyJS/">UglifyJS</a> + </p> + + <p>Custom code to add to the compressed file:<textarea name="js_code" style="width: 100%; height: 15em;" class="field"></textarea></p> + </form> + + <script type="text/javascript"> + function setVersion(ver) { + var urlprefix = ver.options[ver.selectedIndex].value; + var select = document.getElementById("files"), m; + for (var optgr = select.firstChild; optgr; optgr = optgr.nextSibling) + for (var opt = optgr.firstChild; opt; opt = opt.nextSibling) { + if (opt.nodeName != "OPTION") + continue; + else if (m = opt.value.match(/^http:\/\/codemirror.net\/2\/(.*)$/)) + opt.value = urlprefix + m[1]; + else if (m = opt.value.match(/http:\/\/marijnhaverbeke.nl\/git\/codemirror\?a=blob_plain;hb=[^;]+;f=(.*)$/)) + opt.value = urlprefix + m[1]; + } + } + </script> + + </body> +</html> + Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/css/baboon.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/css/baboon.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/css/baboon_vector.svg =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/css/baboon_vector.svg (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/css/baboon_vector.svg 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,153 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> + + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + id="svg3181" + version="1.1" + inkscape:version="0.48.0 r9654" + width="1750" + height="960" + xml:space="preserve" + sodipodi:docname="baboon_vector.svg"><metadata + id="metadata3187"><rdf:RDF><cc:Work + rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs + id="defs3185"><clipPath + clipPathUnits="userSpaceOnUse" + id="clipPath3195"><path + d="M 0,768 1400,768 1400,0 0,0 0,768 z" + id="path3197" /></clipPath><clipPath + clipPathUnits="userSpaceOnUse" + id="clipPath3215"><path + d="M 0,768 1400,768 1400,0 0,0 0,768 z" + id="path3217" /></clipPath></defs><sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1440" + inkscape:window-height="851" + id="namedview3183" + showgrid="false" + inkscape:zoom="0.20550291" + inkscape:cx="1534.1667" + inkscape:cy="795.78156" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1" + inkscape:current-layer="g3189" /><g + id="g3189" + inkscape:groupmode="layer" + inkscape:label="baboon_vector" + transform="matrix(1.25,0,0,-1.25,0,960)"><g + id="g3191"><g + id="g3193" + clip-path="url(#clipPath3195)"><g + id="g3199" + transform="translate(458.9561,569.9678)"><path + d="m 0,0 59.835,69.355 87.034,26.518 133.949,-7.479 c 0,0 74.116,-32.639 74.795,-34.678 0.68,-2.04 84.314,-59.155 84.314,-59.155 l 12.238,-74.795 5.439,-97.912 -13.598,-25.159 -4.76,-40.797 -18.358,-23.118 24.39,-5.561 0.501,-5.192 -14.012,-60.641 16.477,-93.368 7.223,-49.972 -208.295,-51.754 -18.552,4.005 -37.468,8.325 -10.036,4.036 -66.885,10.101 c 0,0 -14.959,74.793 -16.999,73.433 -2.039,-1.359 -42.836,56.437 -42.836,56.437 l -19.719,65.274 12.48,74.571 -7.961,9.643 -26.479,16.187 -12.716,38.309 4.08,48.277 8.769,38.985 L 6.608,-74.308 0,0 z" + style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" + id="path3201" /></g><g + id="g3203" + transform="translate(78.8657,682.1582)"><path + d="M 0,0 142.789,40.797 259.74,52.355 313.457,-232.543 204.665,-291.698 78.194,-293.738 0,0 z" + style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" + id="path3205" /></g><g + id="g3207" + transform="translate(269.5122,345.2344)"><path + d="M 0,0 18.801,-74.425 40.728,-85.408 59.539,-59.541 40.259,13.503 36.821,15.669 0,0 z" + style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" + id="path3209" /></g></g></g><g + id="g3223" + transform="translate(741.918,109.0332)"><path + d="m 0,0 -17.236,-9.401 -16.452,-22.721 -0.783,12.537 6.268,17.234 13.317,6.268 L 0,7.833 14.884,3.917 0,0 z m 172.622,-21.824 c -0.031,0.271 -0.081,0.535 -0.117,0.804 -20.85,7.653 -49.59,7.327 -66.874,10.927 -13.849,2.886 -23.047,9.119 -27.032,12.298 -9.863,-8.494 -12.025,-14.377 -12.025,-14.377 0,0 -9.816,15.309 -30.17,25.76 -7.05,3.621 -17.767,5.691 -29.341,5.691 -24.297,0 -52.384,-9.155 -58.339,-32.223 -10.458,-40.511 9.697,-76.594 49.814,-77.623 1.325,-0.034 2.623,-0.12 3.894,-0.12 36.131,0 48.855,8.572 58.323,15.478 0.027,0.021 0.104,0 0.104,0 0,0 25.126,-11.506 53.529,-11.506 4.419,0 9.156,0.415 14.249,1.063 31.641,4.018 47.989,28.124 43.985,63.828" + style="fill:#df0019;fill-opacity:1;fill-rule:nonzero;stroke:none" + id="path3225" + inkscape:connector-curvature="0" /></g><g + id="g3227" + transform="translate(300.8481,270.0254)"><path + d="m 0,0 c -3.063,-0.691 -12.535,0.784 -12.535,0.784 l 6.267,-25.853 43.481,13.319 -9.01,27.418 C 28.203,15.668 7.867,1.777 0,0" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" + id="path3229" + inkscape:connector-curvature="0" /></g><g + id="g3231" + transform="translate(211.66052,615.85984)"><path + d="m 0,0 -16.243,-2.871 -15.462,-9.4 4.323,-10.938 14.568,9.89 L 2.75,-8.771 0,0 z" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" + id="path3233" + inkscape:connector-curvature="0" /></g><g + id="g3235" + transform="translate(274.15732,626.4084)"><path + d="m 0,0 -15.64,0.407 -14.279,-3.608 2.008,-9.747 14.756,4.208 L 1.111,-8.215 0,0 z" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" + id="path3237" + inkscape:connector-curvature="0" /></g><path + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" + d="M 436.65625 22.28125 C 436.65625 22.28125 338.18375 25.385 251 42.8125 C 163.24875 60.35375 70.40625 99.65625 70.40625 99.65625 L 175.1875 495.28125 L 327.96875 492.34375 L 337.75 527.59375 C 337.75 527.59375 365.095 523.25875 373 518.78125 C 376.31375 516.90375 383.78125 508 383.78125 508 L 377.75 484.65625 L 504.21875 407.15625 L 436.65625 22.28125 z M 410.53125 55.1875 L 465.6875 393.3125 L 346.59375 456.625 L 202.75 466.46875 L 112 114.40625 L 263 79.1875 L 410.53125 55.1875 z " + transform="matrix(0.8,0,0,-0.8,0,768)" + id="path3253" /><g + id="g3247" + transform="matrix(1.199238,-0.02879331,0.02673084,1.0520756,172.41935,498.37339)"><path + d="m 0,0 c 0,0 -1.861,1.481 -9.143,-1.457 9.712,18.867 9.439,39.989 9.439,39.989 0,0 -3.106,-2.465 -11.311,-8.47 9.241,23.044 5.338,72.525 5.338,72.525 0,0 -17.493,40.746 -13.657,45.799 8.841,11.65 23.834,23.968 44.295,25.594 17.935,1.424 44.606,-4.953 55.865,-15.284 4.536,-4.161 23.367,-47.493 23.367,-47.493 0,0 6.104,-35.271 11.619,-54.108 5.513,-18.839 11.054,-26.674 21.284,-34.825 17.831,-14.207 27.076,-29.938 27.076,-29.938 L 143.399,3.945 c 3.655,-17.356 14.875,-34.28 27.39,-47.672 -12.863,1.507 -19.61,8.783 -19.61,8.783 0,0 2.151,-12.664 9.109,-26.554 l 28.712,15.264 -1.762,10.805 c -5.128,9.304 -9.336,15.534 -9.336,15.534 0,0 2.089,0.956 7.385,-3.572 l -2.005,12.296 c -4.814,9.391 -11.773,16.752 -25.115,31.113 5.944,-6.087 15.438,-5.379 20.751,-4.356 l -0.572,3.512 c -2.231,1.278 -5.494,3.171 -10.241,5.957 -12.43,7.299 -22.326,21.049 -22.326,21.049 0,0 12.85,1.815 20.513,11.022 -7.316,-2.641 -18.585,0.799 -18.585,0.799 -17.086,6.772 -15.022,30.217 -17.687,50.587 -2.667,20.37 -9.299,34.125 -9.299,34.125 0,0 -0.243,2.149 11.91,-5.906 -7.744,33.215 -35.545,44.94 -35.545,44.94 0,0 2.223,2.79 22.843,0.044 -16.469,15.817 -32.303,16.896 -32.303,16.896 0,0 10.077,2.25 23.611,0.24 0,0 -3.327,3.508 -7.549,6.453 L 35.985,194.291 -77.543,167.815 -8.211,-101.17 17.481,-99.413 C 8.602,-85.114 -0.371,-63.837 -2.15,-40.857 -4.911,-5.208 0,0 0,0" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" + id="path3249" + inkscape:connector-curvature="0" /></g><g + id="g3255" + transform="translate(204.22134,580.88353)"><path + d="m 0,0 c 0,-1.418 0.43,-2.736 1.168,-3.83 1.523,0.677 3.551,1.094 5.786,1.094 2.164,0 4.133,-0.39 5.639,-1.029 0.711,1.081 1.129,2.374 1.129,3.765 0,3.79 -3.072,6.861 -6.861,6.861 C 3.071,6.861 0,3.79 0,0" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" + id="path3257" + inkscape:connector-curvature="0" /></g><g + id="g3259" + transform="translate(256.3311,595.31646)"><path + d="m 0,0 c 0,-1.418 0.43,-2.736 1.168,-3.83 1.524,0.677 3.552,1.094 5.787,1.094 2.163,0 4.132,-0.39 5.638,-1.029 0.712,1.081 1.129,2.373 1.129,3.765 0,3.79 -3.072,6.861 -6.861,6.861 C 3.071,6.861 0,3.79 0,0" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" + id="path3261" + inkscape:connector-curvature="0" /></g><g + id="g4174" + transform="matrix(0.99694509,0.07810563,-0.07810563,0.99694509,47.348748,-15.348299)"><g + transform="translate(222.5098,610.1558)" + id="g3219"><path + inkscape:connector-curvature="0" + id="path3221" + style="fill:#df0019;fill-opacity:1;fill-rule:nonzero;stroke:none" + d="m 0,0 4.45,2.752 5.34,3.785 7.05,-8.226 7.093,-33.359 17.801,-51.259 13.86,-30.215 26.261,-1.55 -6.685,-35.653 c 0,0 -49.98,-21.871 -49.545,-21.911 -42.657,4.001 -12.553,43.066 -8.631,47.301 L 3.666,-47.869 0,0 z" /></g><g + transform="translate(247.626,467.3545)" + id="g3239"><path + inkscape:connector-curvature="0" + id="path3241" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" + d="M 0,0 C -3.044,-0.345 -5.232,-3.092 -4.888,-6.136 -4.543,-9.18 1.576,-2.254 13.308,-4.961 13.971,-1.97 3.044,0.344 0,0" /></g><g + transform="translate(279.4419,476.5762)" + id="g3243"><path + inkscape:connector-curvature="0" + id="path3245" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" + d="M 0,0 C 3.271,1.08 6.798,-0.697 7.88,-3.969 8.96,-7.24 -0.55,-3.044 -11.258,-11.329 -13.345,-8.586 -3.272,-1.081 0,0" /></g><g + transform="translate(284.1929,525.9082)" + id="g3263"><path + inkscape:connector-curvature="0" + id="path3265" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" + d="M 0,0 C 0,0 -6.972,28.671 -6.972,29.355 L 1.585,2.864 9.999,-10.564 13.634,-32.697 7.922,-11.098 0,0 z M -0.633,-15.036 -9.19,-4.86 -16.478,25.776 c -0.202,0.684 9.106,-28.811 9.106,-28.811 l 8.64,-11.642 2.469,-17.336 -4.37,16.977 z m -6.339,-6.085 -10.457,16.826 -5.444,28.646 6.614,-27.842 11.311,-18.026 1.413,-9.583 -3.437,9.979 z m -53.462,-13.246 -1.437,24.944 -2.682,28.754 5.106,-29.895 1.212,-21.677 4.139,-18.236 -6.338,16.11 z m -4.265,-19.55 -6.665,15.516 0.404,29.205 -0.882,28.169 3.104,-28.396 0.808,-26.697 4.242,-15.972 2.423,-6.617 -3.434,4.792 z m -9.695,-2.967 -7.117,16.885 1.318,32.01 0,25.223 2.115,-25.061 -0.581,-31.259 5.869,-16.429 5.056,-8.671 -6.66,7.302 z m 103.144,-7.97 -6.676,20.38 2.141,11.54 L 16.499,-9.376 4.557,13.104 -5.879,53.97 c 0,0 -8.325,-7.41 -16.781,-8.08 -8.455,-0.671 -15.09,4.018 -15.09,4.018 0,0 3.592,-17.761 8.659,-37.597 5.069,-19.836 17.528,-44.866 17.528,-44.866 0,0 21.578,-8.197 24.302,-16.587 2.724,-8.391 -3.508,-22.911 -14.102,-26.551 -10.593,-3.64 -32.284,-8.262 -32.284,-8.262 0,0 -19,1.512 -20.438,14.26 0,0 4.131,16.406 10.418,19.225 6.285,2.819 21.362,11.174 21.362,11.174 l -8.254,1.332 -7.664,-1.332 c 0,0 -4.784,11.295 -10.973,35.086 -6.19,23.79 -8.967,42.485 -8.967,42.485 0,0 -3.912,-4.391 -14.199,-4.885 -10.286,-0.494 -16.031,7.988 -16.031,7.988 l 1.027,-30.185 -1.049,-25.83 -0.15,-29.22 5.102,-15.99 19.818,-30.448 c 0,0 14.102,-9.293 31.728,-9.293 16.453,1.328 51.131,18.047 51.131,18.047 l 9.536,16.687 z" /></g></g><g + id="g3267" + transform="translate(847.2637,321.5059)"><path + d="m 0,0 c 2.252,3.516 6.693,15.3 6.693,15.3 0,0 3.778,-13.306 1.912,-17.213 -3.056,-6.404 -23.905,-15.3 -23.905,-15.3 0,0 12.196,12.364 15.3,17.213 m -33.514,23.16 -0.757,56.352 c 0,0 11.136,-14.028 11.843,-19.739 1.176,-9.491 -11.086,-36.613 -11.086,-36.613 m -17.575,236.921 c 0,0 12.453,-15.338 14.854,-21.39 1.424,-3.591 2.286,-15.287 2.286,-15.287 l -17.14,36.677 z M -98.574,-86.136 c -9.757,-0.906 -29.836,1.016 -38.912,4.708 -7.499,3.05 -25.734,19.656 -25.734,19.656 l 24.187,-10.86 -4.701,17.627 15.272,-22.009 41.813,-5.356 c 0,0 -8.812,-3.477 -11.925,-3.766 m -74.428,157.941 c -4.518,10.057 -1.763,44.065 -1.763,44.065 0,0 7.544,-31.093 12.338,-40.541 6.978,-13.754 37.015,-49.352 37.015,-49.352 0,0 -40.824,30.759 -47.59,45.828 m -17.833,-149.47 -40.407,24.724 1.636,-17.575 0.026,-0.035 -5.178,-29.811 -2.056,-10.701 0.383,-33.34 -4.982,36.406 6.41,41.45 -11.063,8.338 -17.532,43.159 23.502,-38.779 2.351,14.101 40.634,-25.695 11.924,-5.651 13.809,-28.871 -19.457,22.28 z m -85.522,138.863 17.212,-34.424 c 0,0 -12.972,11.185 -15.299,16.257 -1.905,4.152 -1.913,18.167 -1.913,18.167 m -2.367,66.042 c 0,0 -6.206,15.581 -6.323,21.082 -0.168,7.817 4.568,23.148 7.695,30.315 0.755,1.73 4.103,6.341 4.103,6.341 0,0 -4.654,-24.542 -5.347,-32.829 -0.518,-6.205 -0.128,-24.909 -0.128,-24.909 m -7.195,-114.809 c -0.334,3.363 1.912,13.387 1.912,13.387 l 3.825,-29.643 c 0,0 -5.313,11.967 -5.737,16.256 m -20.082,53.549 c -1.394,3.571 -0.956,15.301 -0.956,15.301 l 13.388,-30.6 c 0,0 -10.639,10.71 -12.432,15.299 m -6.03,106.795 c 0,0 -0.315,35.831 4.637,46.379 4.531,9.647 29.936,30.356 29.936,30.356 0,0 -17.824,-22.47 -21.503,-31.2 -5.089,-12.077 -10.119,-51.437 -10.119,-51.437 l -2.951,5.902 z M 50.121,205.01 c 3.335,-9.155 1.168,-38.956 1.168,-38.956 0,0 -5.451,29.987 -9.221,39.366 -4.214,10.487 -23.014,38.907 -23.014,38.907 0,0 26.78,-27.546 31.067,-39.317 M 54.506,95.624 c 0,0 6.884,-18.586 5.738,-24.861 -0.773,-4.241 -9.562,-14.345 -9.562,-14.345 0,0 2.414,12.874 2.868,17.212 0.573,5.474 0.956,21.994 0.956,21.994 M 19.125,-13.389 c 0,0 9.656,22.183 11.062,30.068 1.235,6.941 0,28.203 0,28.203 0,0 8.477,-22.819 7.106,-30.538 C 35.845,6.183 19.125,-13.389 19.125,-13.389 m 441.487,-40.965 c -3.249,8.935 -6.587,17.23 -10.01,24.928 l -1.862,28.873 -8.857,-4.876 -25.862,49.457 -4.828,-10.34 c -32.69,31.48 -70.457,34.284 -111.982,31.646 -65.568,-4.163 -91.587,-41.63 -79.098,-57.241 12.49,-15.613 18.733,-5.205 40.589,5.203 21.858,10.407 74.937,26.017 110.323,-2.082 35.386,-28.1 86.383,-109.281 50.997,-169.646 -35.386,-60.365 -105.626,-105.385 -182.135,-88.465 -86.422,19.112 -126.078,60.082 -177.675,74.811 -8.311,1.334 -18.347,2.789 -24.791,3.191 -12.671,0.792 -21.6,14.727 -21.6,14.727 l 17.181,-9.327 25.763,-2.36 c 2.331,14 9.395,49.054 9.395,49.054 l -8.688,87.29 -18.668,-27.06 -7.246,10.184 -21.349,-22.915 -15.473,-1.959 14.67,6.596 21.38,29.409 6.7,-13.754 19.485,24.691 0.004,-0.011 16.47,9.525 -3.123,68.69 10.407,-10.407 -4.163,40.59 22.173,71.502 -34.662,91.899 16.652,-4.162 -19.773,35.386 -40.591,38.509 9.368,17.693 -93.671,9.368 -20.229,-7.165 -18.437,38.292 13.22,8.813 -69.039,14.69 2.938,19.095 -80.791,-23.303 -26.147,-19.191 -116.339,0 8.814,-10.188 -42.501,-40.641 -8.911,-78.491 7.344,-1.494 8.814,-45.548 23.502,-24.978 19.096,45.533 -14.689,-4.409 41.13,48.474 30.848,26.44 -14.69,-1.469 19.096,16.158 105.763,2.938 72.917,15.799 -41.623,-14.742 -30.181,-7.285 -104.079,-1.043 1.04,-11.449 -64.526,-61.403 14.571,2.081 -27.844,-63.28 c -15.017,-13.719 -28.06,-55.016 -36.687,-75.145 -9.367,-21.856 -20.816,-39.55 -20.816,-39.55 0,0 -30.182,-6.244 -61.405,-18.734 -31.224,-12.489 -43.713,4.163 -43.713,4.163 l -3.122,-8.326 c 0,0 -18.28,-9.057 -39.303,-11.825 -16.43,-2.162 -9.967,-20.946 -9.613,-26.684 0.405,-6.57 4.294,-19.774 8.325,-24.978 3.227,-4.165 12.525,-10.425 17.694,-11.448 12.039,-2.385 28.101,5.204 45.794,17.693 74.936,-6.245 103.241,-10.321 126.974,8.326 14.572,11.448 29.142,22.897 41.631,40.59 l -15.611,42.671 -8.327,-14.569 -5.807,44.931 1.841,17.863 5.547,-51.234 7.789,9.257 35.387,-70.772 11.448,4.164 c 0,0 13.515,-18.583 23.057,-32.881 l -26.02,25.006 -10.224,-5.964 -11.076,22.152 c 0,0 -13.383,-2.353 -24.727,-18.027 -15.862,-21.915 -23.503,-24.678 -17.627,-78.735 5.876,-54.055 16.452,-54.055 64.632,-121.039 11.752,-16.452 14.601,-18.465 14.601,-18.465 l -51.03,-27.365 -22.327,-5.876 -21.384,-11.28 c 0,0 4.744,-8.174 7.495,-9.369 4.739,-2.062 20.613,1.56 20.613,1.56 0,0 15.603,-6.763 36.756,-6.763 21.152,0 32.903,8.225 47.005,8.225 14.101,0 38.78,-8.225 57.582,-5.876 18.802,2.351 22.328,12.927 22.328,12.927 l -51.706,54.057 -4.675,47.096 -56.605,75.769 -3.038,9.437 65.791,-82.24 5.107,-46.75 55.161,-61.405 37.468,-8.325 c 0,0 -0.257,1.226 -0.625,3.114 -6.146,15.664 -6.986,34.894 -1.999,54.214 6.975,27.012 38.85,36.596 64.029,36.596 12.506,0 24.179,-2.312 32.025,-6.341 12.912,-6.63 21.851,-15.076 27.029,-20.917 3.673,4.516 7.133,7.194 11.833,11.11 0,0 12.143,-11.751 45.047,-14.101 27.14,-1.939 45.048,-8.226 70.901,-19.585 53.676,-23.584 102.5,-61.785 207.618,-45.132 105.119,16.651 206.073,113.444 164.442,227.929" + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" + id="path3269" + inkscape:connector-curvature="0" /></g><path + inkscape:connector-curvature="0" + style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" + d="m 329.26398,723.3082 -118.025,-19.2 -120.800003,-28.175 72.600003,-281.65 115.075,7.875 95.275,50.65 -44.125,270.5 z m -6.55,-10.575 40.675,-252.4 -87.85,-47.275 -106.125,-7.325 -66.95,262.8 111.4,26.275 108.85,17.925 z" + id="path3253-3" /></g></svg> \ No newline at end of file Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/css/docs.css =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/css/docs.css (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/css/docs.css 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,154 @@ +body { + font-family: Droid Sans, Arial, sans-serif; + line-height: 1.5; + max-width: 64.3em; + margin: 3em auto; + padding: 0 1em; +} + +h1 { + letter-spacing: -3px; + font-size: 3.23em; + font-weight: bold; + margin: 0; +} + +h2 { + font-size: 1.23em; + font-weight: bold; + margin: .5em 0; + letter-spacing: -1px; +} + +h3 { + font-size: 1em; + font-weight: bold; + margin: .4em 0; +} + +pre { + background-color: #eee; + -moz-border-radius: 6px; + -webkit-border-radius: 6px; + border-radius: 6px; + padding: 1em; +} + +pre.code { + margin: 0 1em; +} + +.grey { + font-size: 2.2em; + padding: .5em 1em; + line-height: 1.2em; + margin-top: .5em; + position: relative; +} + +img.logo { + position: absolute; + right: -25px; + bottom: 4px; +} + +a:link, a:visited, .quasilink { + color: #df0019; + cursor: pointer; + text-decoration: none; +} + +a:hover, .quasilink:hover { + color: #800004; +} + +h1 a:link, h1 a:visited, h1 a:hover { + color: black; +} + +ul { + margin: 0; + padding-left: 1.2em; +} + +a.download { + color: white; + background-color: #df0019; + width: 100%; + display: block; + text-align: center; + font-size: 1.23em; + font-weight: bold; + text-decoration: none; + -moz-border-radius: 6px; + -webkit-border-radius: 6px; + border-radius: 6px; + padding: .5em 0; + margin-bottom: 1em; +} + +a.download:hover { + background-color: #bb0010; +} + +.rel { + margin-bottom: 0; +} + +.rel-note { + color: #777; + font-size: .9em; + margin-top: .1em; +} + +.logo-braces { + color: #df0019; + position: relative; + top: -4px; +} + +.blk { + float: left; +} + +.left { + width: 37em; + padding-right: 6.53em; + padding-bottom: 1em; +} + +.left1 { + width: 15.24em; + padding-right: 6.45em; +} + +.left2 { + width: 15.24em; +} + +.right { + width: 20.68em; +} + +.leftbig { + width: 42.44em; + padding-right: 6.53em; +} + +.rightsmall { + width: 15.24em; +} + +.clear:after { + visibility: hidden; + display: block; + font-size: 0; + content: " "; + clear: both; + height: 0; +} +.clear { display: inline-block; } +/* start commented backslash hack \*/ +* html .clear { height: 1%; } +.clear { display: block; } +/* close commented backslash hack */ Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/demo/activeline.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/demo/activeline.html (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/demo/activeline.html 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,71 @@ +<!doctype html> +<html> + <head> + <title>CodeMirror 2: Active Line Demo</title> + <link rel="stylesheet" href="../lib/codemirror.css"> + <script src="../lib/codemirror.js"></script> + <link rel="stylesheet" href="../theme/default.css"> + <script src="../mode/xml/xml.js"></script> + <link rel="stylesheet" href="../css/docs.css"> + + <style type="text/css"> + .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;} + .activeline {background: #f0fcff !important;} + </style> + </head> + <body> + <h1>CodeMirror 2: Active Line Demo</h1> + + <form><textarea id="code" name="code"> +<?xml version="1.0" encoding="UTF-8"?> +<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0" + xmlns:georss="http://www.georss.org/georss" + xmlns:twitter="http://api.twitter.com"> + <channel> + <title>Twitter / codemirror</title> + <link>http://twitter.com/codemirror</link> + <atom:link type="application/rss+xml" + href="http://twitter.com/statuses/user_timeline/242283288.rss" rel="self"/> + <description>Twitter updates from CodeMirror / codemirror.</description> + <language>en-us</language> + <ttl>40</ttl> + <item> + <title>codemirror: http://cloud-ide.com — they're springing up like mushrooms. This one + uses CodeMirror as its editor.</title> + <description>codemirror: http://cloud-ide.com — they're springing up like mushrooms. This + one uses CodeMirror as its editor.</description> + <pubDate>Thu, 17 Mar 2011 23:34:47 +0000</pubDate> + <guid>http://twitter.com/codemirror/statuses/48527733722058752</guid> + <link>http://twitter.com/codemirror/statuses/48527733722058752</link> + <twitter:source>web</twitter:source> + <twitter:place/> + </item> + <item> + <title>codemirror: Posted a description of the CodeMirror 2 internals at + http://codemirror.net/2/internals.html</title> + <description>codemirror: Posted a description of the CodeMirror 2 internals at + http://codemirror.net/2/internals.html</description> + <pubDate>Wed, 02 Mar 2011 12:15:09 +0000</pubDate> + <guid>http://twitter.com/codemirror/statuses/42920879788789760</guid> + <link>http://twitter.com/codemirror/statuses/42920879788789760</link> + <twitter:source>web</twitter:source> + <twitter:place/> + </item> +</feed></textarea></form> + + <script> +var editor = CodeMirror.fromTextArea(document.getElementById("code"), { + mode: "application/xml", + lineNumbers: true, + onCursorActivity: function() { + editor.setLineClass(hlLine, null); + hlLine = editor.setLineClass(editor.getCursor().line, "activeline"); + } +}); +var hlLine = editor.setLineClass(0, "activeline"); +</script> + + <p>Styling the current cursor line.</p> + + </body> +</html> Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/demo/complete.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/demo/complete.html (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/demo/complete.html 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,79 @@ +<!doctype html> +<html> + <head> + <title>CodeMirror 2: Autocomplete Demo</title> + <link rel="stylesheet" href="../lib/codemirror.css"> + <script src="../lib/codemirror.js"></script> + <link rel="stylesheet" href="../theme/night.css"> + <script src="../mode/javascript/javascript.js"></script> + <link rel="stylesheet" href="../css/docs.css"> + + <style type="text/css"> + .completions { + position: absolute; + z-index: 10; + overflow: hidden; + -webkit-box-shadow: 2px 3px 5px rgba(0,0,0,.2); + -moz-box-shadow: 2px 3px 5px rgba(0,0,0,.2); + box-shadow: 2px 3px 5px rgba(0,0,0,.2); + } + .completions select { + background: #fafafa; + outline: none; + border: none; + padding: 0; + margin: 0; + font-family: monospace; + } + .CodeMirror { + border: 1px solid #eee; + } + </style> + </head> + <body> + <h1>CodeMirror 2: Autocomplete demo</h1> + + <form><textarea id="code" name="code"> +function getCompletions(token, context) { + var found = [], start = token.string; + function maybeAdd(str) { + if (str.indexOf(start) == 0) found.push(str); + } + function gatherCompletions(obj) { + if (typeof obj == "string") forEach(stringProps, maybeAdd); + else if (obj instanceof Array) forEach(arrayProps, maybeAdd); + else if (obj instanceof Function) forEach(funcProps, maybeAdd); + for (var name in obj) maybeAdd(name); + } + + if (context) { + // If this is a property, see if it belongs to some object we can + // find in the current environment. + var obj = context.pop(), base; + if (obj.className == "js-variable") + base = window[obj.string]; + else if (obj.className == "js-string") + base = ""; + else if (obj.className == "js-atom") + base = 1; + while (base != null && context.length) + base = base[context.pop().string]; + if (base != null) gatherCompletions(base); + } + else { + // If not, just look in the window object and any local scope + // (reading into JS mode internals to get at the local variables) + for (var v = token.state.localVars; v; v = v.next) maybeAdd(v.name); + gatherCompletions(window); + forEach(keywords, maybeAdd); + } + return found; +} +</textarea></form> + +<p>Press <strong>ctrl-space</strong> to activate autocompletion. See +the <a href="complete.js">code</a> to figure out how it works.</p> + + <script src="complete.js"></script> + </body> +</html> Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/demo/complete.js =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/demo/complete.js (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/demo/complete.js 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,151 @@ +(function () { + // Minimal event-handling wrapper. + function stopEvent() { + if (this.preventDefault) {this.preventDefault(); this.stopPropagation();} + else {this.returnValue = false; this.cancelBubble = true;} + } + function addStop(event) { + if (!event.stop) event.stop = stopEvent; + return event; + } + function connect(node, type, handler) { + function wrapHandler(event) {handler(addStop(event || window.event));} + if (typeof node.addEventListener == "function") + node.addEventListener(type, wrapHandler, false); + else + node.attachEvent("on" + type, wrapHandler); + } + + function forEach(arr, f) { + for (var i = 0, e = arr.length; i < e; ++i) f(arr[i]); + } + + var editor = CodeMirror.fromTextArea(document.getElementById("code"), { + lineNumbers: true, + theme: "night", + onKeyEvent: function(i, e) { + // Hook into ctrl-space + if (e.keyCode == 32 && (e.ctrlKey || e.metaKey) && !e.altKey) { + e.stop(); + return startComplete(); + } + } + }); + + function startComplete() { + // We want a single cursor position. + if (editor.somethingSelected()) return; + // Find the token at the cursor + var cur = editor.getCursor(false), token = editor.getTokenAt(cur), tprop = token; + // If it's not a 'word-style' token, ignore the token. + if (!/^[\w$_]*$/.test(token.string)) { + token = tprop = {start: cur.ch, end: cur.ch, string: "", state: token.state, + className: token.string == "." ? "js-property" : null}; + } + // If it is a property, find out what it is a property of. + while (tprop.className == "js-property") { + tprop = editor.getTokenAt({line: cur.line, ch: tprop.start}); + if (tprop.string != ".") return; + tprop = editor.getTokenAt({line: cur.line, ch: tprop.start}); + if (!context) var context = []; + context.push(tprop); + } + var completions = getCompletions(token, context); + if (!completions.length) return; + function insert(str) { + editor.replaceRange(str, {line: cur.line, ch: token.start}, {line: cur.line, ch: token.end}); + } + // When there is only one completion, use it directly. + if (completions.length == 1) {insert(completions[0]); return true;} + + // Build the select widget + var complete = document.createElement("div"); + complete.className = "completions"; + var sel = complete.appendChild(document.createElement("select")); + sel.multiple = true; + for (var i = 0; i < completions.length; ++i) { + var opt = sel.appendChild(document.createElement("option")); + opt.appendChild(document.createTextNode(completions[i])); + } + sel.firstChild.selected = true; + sel.size = Math.min(10, completions.length); + var pos = editor.cursorCoords(); + complete.style.left = pos.x + "px"; + complete.style.top = pos.yBot + "px"; + document.body.appendChild(complete); + // Hack to hide the scrollbar. + if (completions.length <= 10) + complete.style.width = (sel.clientWidth - 1) + "px"; + + var done = false; + function close() { + if (done) return; + done = true; + complete.parentNode.removeChild(complete); + } + function pick() { + insert(sel.options[sel.selectedIndex].value); + close(); + setTimeout(function(){editor.focus();}, 50); + } + connect(sel, "blur", close); + connect(sel, "keydown", function(event) { + var code = event.keyCode; + // Enter and space + if (code == 13 || code == 32) {event.stop(); pick();} + // Escape + else if (code == 27) {event.stop(); close(); editor.focus();} + else if (code != 38 && code != 40) {close(); editor.focus(); setTimeout(startComplete, 50);} + }); + connect(sel, "dblclick", pick); + + sel.focus(); + // Opera sometimes ignores focusing a freshly created node + if (window.opera) setTimeout(function(){if (!done) sel.focus();}, 100); + return true; + } + + var stringProps = ("charAt charCodeAt indexOf lastIndexOf substring substr slice trim trimLeft trimRight " + + "toUpperCase toLowerCase split concat match replace search").split(" "); + var arrayProps = ("length concat join splice push pop shift unshift slice reverse sort indexOf " + + "lastIndexOf every some filter forEach map reduce reduceRight ").split(" "); + var funcProps = "prototype apply call bind".split(" "); + var keywords = ("break case catch continue debugger default delete do else false finally for function " + + "if in instanceof new null return switch throw true try typeof var void while with").split(" "); + + function getCompletions(token, context) { + var found = [], start = token.string; + function maybeAdd(str) { + if (str.indexOf(start) == 0) found.push(str); + } + function gatherCompletions(obj) { + if (typeof obj == "string") forEach(stringProps, maybeAdd); + else if (obj instanceof Array) forEach(arrayProps, maybeAdd); + else if (obj instanceof Function) forEach(funcProps, maybeAdd); + for (var name in obj) maybeAdd(name); + } + + if (context) { + // If this is a property, see if it belongs to some object we can + // find in the current environment. + var obj = context.pop(), base; + if (obj.className == "js-variable") + base = window[obj.string]; + else if (obj.className == "js-string") + base = ""; + else if (obj.className == "js-atom") + base = 1; + while (base != null && context.length) + base = base[context.pop().string]; + if (base != null) gatherCompletions(base); + } + else { + // If not, just look in the window object and any local scope + // (reading into JS mode internals to get at the local variables) + for (var v = token.state.localVars; v; v = v.next) maybeAdd(v.name); + gatherCompletions(window); + forEach(keywords, maybeAdd); + } + return found; + } +})(); Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/demo/marker.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/demo/marker.html (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/demo/marker.html 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,53 @@ +<!doctype html> +<html> + <head> + <title>CodeMirror 2: Breakpoint Demo</title> + <link rel="stylesheet" href="../lib/codemirror.css"> + <script src="../lib/codemirror.js"></script> + <link rel="stylesheet" href="../theme/default.css"> + <script src="../mode/javascript/javascript.js"></script> + <link rel="stylesheet" href="../css/docs.css"> + + <style type="text/css"> + .CodeMirror-gutter { + width: 3em; + background: white; + } + .CodeMirror { + border: 1px solid #aaa; + } + </style> + </head> + <body> + <h1>CodeMirror 2: Breakpoint demo</h1> + + <form><textarea id="code" name="code"> +CodeMirror.fromTextArea(document.getElementById("code"), { + lineNumbers: true, + onGutterClick: function(cm, n) { + var info = cm.lineInfo(n); + if (info.markerText) + cm.clearMarker(n); + else + cm.setMarker(n, "<span style=\"color: #900\">●</span> %N%"); + } +}); +</textarea></form> + +<p>Click the line-number gutter to add or remove 'breakpoints'.</p> + + <script> + CodeMirror.fromTextArea(document.getElementById("code"), { + lineNumbers: true, + onGutterClick: function(cm, n) { + var info = cm.lineInfo(n); + if (info.markerText) + cm.clearMarker(n); + else + cm.setMarker(n, "<span style=\"color: #900\">●</span> %N%"); + } + }); + </script> + + </body> +</html> Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/demo/mustache.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/demo/mustache.html (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/demo/mustache.html 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,57 @@ +<!doctype html> +<html> + <head> + <title>CodeMirror 2: Overlay Parser Demo</title> + <link rel="stylesheet" href="../lib/codemirror.css"> + <script src="../lib/codemirror.js"></script> + <script src="../lib/overlay.js"></script> + <link rel="stylesheet" href="../theme/default.css"> + <script src="../mode/xml/xml.js"></script> + <link rel="stylesheet" href="../css/docs.css"> + + <style type="text/css"> + .CodeMirror {border: 1px solid black;} + .mustache {color: #0ca;} + </style> + </head> + <body> + <h1>CodeMirror 2: Overlay Parser Demo</h1> + + <form><textarea id="code" name="code"> +<html> + <body> + <h1>{{title}}</h1> + <p>These are links to {{things}}:</p> + <ul>{{#links}} + <li><a href="{{url}}">{{text}}</a></li> + {{/links}}</ul> + </body> +</html> +</textarea></form> + + <script> +CodeMirror.defineMode("mustache", function(config, parserConfig) { + var mustacheOverlay = { + token: function(stream, state) { + if (stream.match("{{")) { + while ((ch = stream.next()) != null) + if (ch == "}" && stream.next() == "}") break; + return "mustache"; + } + while (stream.next() != null && !stream.match("{{", false)) {} + return null; + } + }; + return CodeMirror.overlayParser(CodeMirror.getMode(config, parserConfig.backdrop || "text/html"), mustacheOverlay); +}); +var editor = CodeMirror.fromTextArea(document.getElementById("code"), {mode: "mustache"}); +</script> + + <p>Demonstration of a mode that parses HTML, highlighting + the <a href="http://mustache.github.com/">Mustache</a> templating + directives inside of it by using the code + in <a href="../lib/overlay.js"><code>overlay.js</code></a>. View + source to see the 15 lines of code needed to accomplish this.</p> + + </body> +</html> Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/demo/resize.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/demo/resize.html (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/demo/resize.html 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,44 @@ +<!doctype html> +<html> + <head> + <title>CodeMirror 2: Autoresize Demo</title> + <link rel="stylesheet" href="../lib/codemirror.css"> + <script src="../lib/codemirror.js"></script> + <link rel="stylesheet" href="../theme/default.css"> + <script src="../mode/css/css.js"></script> + <link rel="stylesheet" href="../css/docs.css"> + + <style type="text/css"> + .CodeMirror { + border: 1px solid #eee; + } + .CodeMirror-scroll { + height: auto; + overflow-y: hidden; + overflow-x: auto; + } + </style> + </head> + <body> + <h1>CodeMirror 2: Autoresize demo</h1> + + <form><textarea id="code" name="code"> +.CodeMirror-scroll { + height: auto; + overflow-y: hidden; + overflow-x: auto; +}</textarea></form> + +<p>By setting a single CSS property, CodeMirror can be made to +automatically resize to fit the content. Use <code>max-height</code> +to prevent it from growing past a given point (on halfway modern +browsers).</p> + + <script> + CodeMirror.fromTextArea(document.getElementById("code"), { + lineNumbers: true + }); + </script> + + </body> +</html> Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/demo/runmode.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/demo/runmode.html (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/demo/runmode.html 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,50 @@ +<!doctype html> +<html> + <head> + <title>CodeMirror 2: Mode Runner Demo</title> + <link rel="stylesheet" href="../lib/codemirror.css"> + <script src="../lib/codemirror.js"></script> + <script src="../lib/runmode.js"></script> + <link rel="stylesheet" href="../theme/default.css"> + <script src="../mode/xml/xml.js"></script> + <link rel="stylesheet" href="../css/docs.css"> + </head> + <body> + <h1>CodeMirror 2: Mode Runner Demo</h1> + + <textarea id="code" style="width: 90%; height: 7em; border: 1px solid black; padding: .2em .4em;"> +<foobar> + <blah>Enter your xml here and press the button below to display + it as highlighted by the CodeMirror XLM mode</blah> + <tag2 foo="2" bar="&quot;bar&quot;"/> +</foobar></textarea><br> + <button onclick="doHighlight();">Highlight!</button> + <pre id="output" class="cm-s-default"></pre> + + <script> +function doHighlight() { + CodeMirror.runMode(document.getElementById("code").value, "application/xml", + document.getElementById("output")); +} +</script> + + <p>Running a CodeMirror mode outside of the editor. + The <code>CodeMirror.runMode</code> function, defined + in <code><a href="../lib/runmode.js">lib/runmode.js</a></code> takes the following arguments:</p> + + <dl> + <dt><code>text (string)</code></dt> + <dd>The document to run through the highlighter.</dd> + <dt><code>mode (<a href="../manual.html#option_mode">mode spec</a>)</code></dt> + <dd>The mode to use (must be loaded as normal).</dd> + <dt><code>output (function or DOM node)</code></dt> + <dd>If this is a function, it will be called for each token with + two arguments, the token's text and the token's style class (may + be <code>null</code> for unstyled tokens). If it is a DOM node, + the tokens will be converted to <code>span</code> elements as in + an editor, and inserted into the node + (through <code>innerHTML</code>).</dd> + </dl> + + </body> +</html> Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/demo/search.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/demo/search.html (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/demo/search.html 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,106 @@ +<!doctype html> +<html> + <head> + <title>CodeMirror 2: Search/Replace Demo</title> + <link rel="stylesheet" href="../lib/codemirror.css"> + <script src="../lib/codemirror.js"></script> + <link rel="stylesheet" href="../theme/default.css"> + <script src="../mode/xml/xml.js"></script> + <link rel="stylesheet" href="../css/docs.css"> + + <style type="text/css"> + .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;} + .searched {background: yellow;} + </style> + </head> + <body> + <h1>CodeMirror 2: Search/Replace Demo</h1> + + <form><textarea id="code" name="code"> + <dt id="option_indentWithTabs"><code>indentWithTabs (boolean)</code></dt> + <dd>Whether, when indenting, the first N*8 spaces should be + replaced by N tabs. Default is false.</dd> + + <dt id="option_tabMode"><code>tabMode (string)</code></dt> + <dd>Determines what happens when the user presses the tab key. + Must be one of the following: + <dl> + <dt><code>"classic" (the default)</code></dt> + <dd>When nothing is selected, insert a tab. Otherwise, + behave like the <code>"shift"</code> mode. (When shift is + held, this behaves like the <code>"indent"</code> mode.)</dd> + <dt><code>"shift"</code></dt> + <dd>Indent all selected lines by + one <a href="#option_indentUnit"><code>indentUnit</code></a>. + If shift was held while pressing tab, un-indent all selected + lines one unit.</dd> + <dt><code>"indent"</code></dt> + <dd>Indent the line the 'correctly', based on its syntactic + context. Only works if the + mode <a href="#indent">supports</a> it.</dd> + <dt><code>"default"</code></dt> + <dd>Do not capture tab presses, let the browser apply its + default behaviour (which usually means it skips to the next + control).</dd> + </dl></dd> + + <dt id="option_enterMode"><code>enterMode (string)</code></dt> + <dd>Determines whether and how new lines are indented when the + enter key is pressed. The following modes are supported: + <dl> + <dt><code>"indent" (the default)</code></dt> + <dd>Use the mode's indentation rules to give the new line + the correct indentation.</dd> + <dt><code>"keep"</code></dt> + <dd>Indent the line the same as the previous line.</dd> + <dt><code>"flat"</code></dt> + <dd>Do not indent the new line.</dd> + </dl></dd> +</textarea></form> +<button type=button onclick="search()">Search</button> +<input type=text style="width: 5em" id=query value=indent> or +<button type=button onclick="replace()">replace</button> it by +<input type=text style="width: 5em" id=replace> + + <script> +var editor = CodeMirror.fromTextArea(document.getElementById("code"), {mode: "text/html", lineNumbers: true}); + +var lastPos = null, lastQuery = null, marked = []; + +function unmark() { + for (var i = 0; i < marked.length; ++i) marked[i](); + marked.length = 0; +} + +function search() { + unmark(); + var text = document.getElementById("query").value; + if (!text) return; + for (var cursor = editor.getSearchCursor(text); cursor.findNext();) + marked.push(editor.markText(cursor.from(), cursor.to(), "searched")); + + if (lastQuery != text) lastPos = null; + var cursor = editor.getSearchCursor(text, lastPos || editor.getCursor()); + if (!cursor.findNext()) { + cursor = editor.getSearchCursor(text); + if (!cursor.findNext()) return; + } + editor.setSelection(cursor.from(), cursor.to()); + lastQuery = text; lastPos = cursor.to(); +} + +function replace() { + unmark(); + var text = document.getElementById("query").value, + replace = document.getElementById("replace").value; + if (!text) return; + for (var cursor = editor.getSearchCursor(text); cursor.findNext();) + editor.replaceRange(replace, cursor.from(), cursor.to()); +} +</script> + + <p>Demonstration of search/replace functionality and marking + text.</p> + + </body> +</html> Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/demo/theme.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/demo/theme.html (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/demo/theme.html 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,52 @@ +<!doctype html> +<html> + <head> + <title>CodeMirror 2: Theme Demo</title> + <link rel="stylesheet" href="../lib/codemirror.css"> + <script src="../lib/codemirror.js"></script> + <link rel="stylesheet" href="../theme/default.css"> + <link rel="stylesheet" href="../theme/neat.css"> + <link rel="stylesheet" href="../theme/elegant.css"> + <link rel="stylesheet" href="../theme/night.css"> + <script src="../mode/javascript/javascript.js"></script> + <link rel="stylesheet" href="../css/docs.css"> + + <style type="text/css"> + .CodeMirror {border: 1px solid black;} + </style> + </head> + <body> + <h1>CodeMirror 2: Theme demo</h1> + + <form><textarea id="code" name="code"> +function findSequence(goal) { + function find(start, history) { + if (start == goal) + return history; + else if (start > goal) + return null; + else + return find(start + 5, "(" + history + " + 5)") || + find(start * 3, "(" + history + " * 3)"); + } + return find(1, "1"); +}</textarea></form> + +<p>Select a theme: <select onchange="selectTheme(this.value)"> + <option selected>default</option> + <option>night</option> + <option>neat</option> + <option>elegant</option> +</select> +</p> + +<script> + var editor = CodeMirror.fromTextArea(document.getElementById("code"), { + lineNumbers: true + }); + function selectTheme(theme) { + editor.setOption("theme", theme); + } +</script> + </body> +</html> Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/index.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/index.html (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/index.html 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,234 @@ +<!doctype html> +<html> + <head> + <title>CodeMirror</title> + <link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Droid+Sans|Droid+Sans:bold"/> + <link rel="stylesheet" type="text/css" href="css/docs.css"/> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> + <link rel="alternate" href="http://twitter.com/statuses/user_timeline/242283288.rss" type="application/rss+xml"/> + </head> + <body> + +<h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMirror</a></h1> + +<pre class="grey"> +<img src="css/baboon.png" class="logo" alt="logo"/>/* In-browser code editing + made bearable */ +</pre> + +<div class="clear"><div class="left blk"> + + <p style="margin-top: 0">CodeMirror is a JavaScript library that can + be used to create a relatively pleasant editor interface for + code-like content ― computer programs, HTML markup, and + similar. If a mode has been written for the language you are + editing, the code will be coloured, and the editor will optionally + help you with indentation.</p> + + <p>This is the project page for CodeMirror 2, the currently more + actively developed, and recommended + version. <a href="1/index.html">CodeMirror 1</a> is still available + from here.</p> + + <div class="clear"><div class="left1 blk"> + + <h2 style="margin-top: 0">Supported modes:</h2> + + <ul> + <li><a href="mode/javascript/index.html">JavaScript</a></li> + <li><a href="mode/xml/index.html">XML/HTML</a></li> + <li><a href="mode/css/index.html">CSS</a></li> + <li><a href="mode/htmlmixed/index.html">HTML mixed-mode</a></li> + <li><a href="mode/python/index.html">Python</a></li> + <li><a href="mode/php/index.html">PHP</a></li> + <li><a href="mode/diff/index.html">diff</a></li> + <li><a href="mode/clike/index.html">C, Java, and similar</a></li> + <li><a href="mode/stex/index.html">sTeX, LaTeX</a></li> + <li><a href="mode/haskell/index.html">Haskell</a></li> + <li><a href="mode/smalltalk/index.html">Smalltalk</a></li> + <li><a href="mode/rst/index.html">reStructuredText</a></li> + <li><a href="mode/plsql/index.html">PL/SQL</a></li> + <li><a href="mode/lua/index.html">Lua</a></li> + </ul> + + </div><div class="left2 blk"> + + <h2 style="margin-top: 0">Usage demos:</h2> + + <ul> + <li><a href="demo/complete.html">Autocompletion</a></li> + <li><a href="demo/mustache.html">Mode overlays</a></li> + <li><a href="demo/search.html">Search/replace</a></li> + <li><a href="demo/resize.html">Auto-resizing editor</a></li> + <li><a href="demo/marker.html">Setting breakpoints</a></li> + <li><a href="demo/activeline.html">Highlighting the current line</a></li> + <li><a href="demo/theme.html">Theming</a></li> + <li><a href="demo/runmode.html">Stand-alone highlighting</a></li> + </ul> + + </div></div> + + <h2 id="code">Getting the code</h2> + + <p>All of CodeMirror is released under a <a + href="LICENSE">MIT-style</a> license. To get it, you can download + the <a href="http://codemirror.net/codemirror.zip">latest + release</a> or the current <a + href="http://codemirror.net/codemirror2-latest.zip">development + snapshot</a> as zip files. To create a custom minified script file, + you can use the <a href="compress.html">compression API</a>.</p> + + <p>We use <a href="http://git-scm.com/">git</a> for version control. + The main repository can be fetched in this way:</p> + + <pre class="code">git clone http://marijnhaverbeke.nl/git/codemirror2</pre> + + <p>CodeMirror can also be found on GitHub at <a + href="http://github.com/marijnh/CodeMirror2">marijnh/CodeMirror2</a>. + If you plan to hack on the code and contribute patches, the best way + to do it is to create a GitHub fork, and send pull requests.</p> + + <h2 id="documention">Documentation</h2> + + <p>The <a href="manual.html">manual</a> is your first stop for + learning how to use this library. It starts with a quick explanation + of how to use the editor, and then describes all of the (many) + options and methods that CodeMirror exposes.</p> + + <p>For those who want to learn more about the code, there is + an <a href="internals.html">overview of the internals</a> available. + The <a href="http://github.com/marijnh/CodeMirror2">source code</a> + itself is, for the most part, also well commented.</p> + + <h2 id="support">Support and bug reports</h2> + + <p>There is + a <a href="http://groups.google.com/group/codemirror">Google + group</a> (a sort of mailing list/newsgroup thing) for discussion + and news related to CodeMirror. Reporting bugs is best done + on <a href="http://github.com/marijnh/CodeMirror2/issues">github</a>. + You can also e-mail me + directly: <a href="mailto:marijnh@gmail.com">Marijn + Haverbeke</a>.</p> + + <h2 id="supported">Supported browsers</h2> + + <p>The following browsers are able to run CodeMirror:</p> + + <ul> + <li>Firefox 2 or higher</li> + <li>Chrome, any version</li> + <li>Safari 3 or higher</li> + <li>Internet Explorer 6 or higher</li> + <li>Opera 9 or higher (with some key-handling problems on OS X)</li> + </ul> + + <p>I am not actively testing against every new browser release, and + vendors have a habit of introducing bugs all the time, so I am + relying on the community to tell me when something breaks. + See <a href="#support">here</a> for information on how to contact + me.</p> + +</div> + +<div class="right blk"> + + <a href="http://codemirror.net/codemirror.zip" class="download">Download the latest release</a> + + <h2>Make a donation</h2> + + <ul> + <li><span onclick="document.getElementById('paypal').submit();" class="quasilink">Paypal</span></li> + <li><span onclick="document.getElementById('bankinfo').style.display = 'block';" class="quasilink">Bank</span></li> + </ul> + + <p id="bankinfo" style="display: none;"> + Bank: <i>Rabobank</i><br/> + Country: <i>Netherlands</i><br/> + SWIFT: <i>RABONL2U</i><br/> + Account: <i>147850770</i><br/> + Name: <i>Marijn Haverbeke</i><br/> + IBAN: <i>NL26 RABO 0147 8507 70</i> + </p> + + <h2>Releases:</h2> + + <p class="rel">07-06-2011: <a href="http://codemirror.net/codemirror-2.02.zip">Version 2.1</a>:</p> + <p class="rel-note">Add + a <a href="manual.html#option_theme">theme</a> system + (<a href="demo/theme.html">demo</a>). Note that this is not + backwards-compatible—you'll have to update your styles and + modes!</p> + + <p class="rel">07-06-2011: <a href="http://codemirror.net/codemirror-2.02.zip">Version 2.02</a>:</p> + <ul class="rel-note"> + <li>Add a <a href="mode/lua/index.html">Lua mode</a>.</li> + <li>Fix reverse-searching for a regexp.</li> + <li>Empty lines can no longer break highlighting.</li> + <li>Rework scrolling model (the outer wrapper no longer does the scrolling).</li> + <li>Solve horizontal jittering on long lines.</li> + <li>Add <a href="demo/runmode.html">runmode.js</a>.</li> + <li>Immediately re-highlight text when typing.</li> + <li>Fix problem with 'sticking' horizontal scrollbar.</li> + </ul> + + <p class="rel">26-05-2011: <a href="http://codemirror.net/codemirror-2.01.zip">Version 2.01</a>:</p> + <ul class="rel-note"> + <li>Add a <a href="mode/smalltalk/index.html">Smalltalk mode</a>.</li> + <li>Add a <a href="mode/rst/index.html">reStructuredText mode</a>.</li> + <li>Add a <a href="mode/python/index.html">Python mode</a>.</li> + <li>Add a <a href="mode/plsql/index.html">PL/SQL mode</a>.</li> + <li><code>coordsChar</code> now works</li> + <li>Fix a problem where <code>onCursorActivity</code> interfered with <code>onChange</code>.</li> + <li>Fix a number of scrolling and mouse-click-position glitches.</li> + <li>Pass information about the changed lines to <code>onChange</code>.</li> + <li>Support cmd-up/down on OS X.</li> + <li>Add triple-click line selection.</li> + <li>Don't handle shift when changing the selection through the API.</li> + <li>Support <code>"nocursor"</code> mode for <code>readOnly</code> option.</li> + <li>Add an <code>onHighlightComplete</code> option.</li> + <li>Fix the context menu for Firefox.</li> + </ul> + + <p class="rel">28-03-2011: <a href="http://codemirror.net/codemirror-2.0.zip">Version 2.0</a>:</p> + <p class="rel-note">CodeMirror 2 is a complete rewrite that's + faster, smaller, simpler to use, and less dependent on browser + quirks. See <a href="internals.html">this</a> + and <a href="http://groups.google.com/group/codemirror/browse_thread/thread/5a8e894024a9…">this</a> + for more information.</a> + + <p class="rel">28-03-2011: <a href="http://codemirror.net/codemirror-1.0.zip">Version 1.0</a>:</p> + <ul class="rel-note"> + <li>Fix error when debug history overflows.</li> + <li>Refine handling of C# verbatim strings.</li> + <li>Fix some issues with JavaScript indentation.</li> + </ul> + + <p class="rel">22-02-2011: <a href="https://github.com/marijnh/codemirror2/tree/beta2">Version 2.0 beta 2</a>:</p> + <p class="rel-note">Somewhate more mature API, lots of bugs shaken out.</a> + + <p class="rel">17-02-2011: <a href="http://codemirror.net/codemirror-0.94.zip">Version 0.94</a>:</p> + <ul class="rel-note"> + <li><code>tabMode: "spaces"</code> was modified slightly (now indents when something is selected).</li> + <li>Fixes a bug that would cause the selection code to break on some IE versions.</li> + <li>Disabling spell-check on WebKit browsers now works.</li> + </ul> + + <p class="rel">08-02-2011: <a href="http://codemirror.net/2/">Version 2.0 beta 1</a>:</p> + <p class="rel-note">CodeMirror 2 is a complete rewrite of + CodeMirror, no longer depending on an editable frame.</p> + + <p><a href="oldrelease.html">Older releases...</a></p> + +</div></div> + +<div style="height: 2em"> </div> + + <form action="https://www.paypal.com/cgi-bin/webscr" method="post" id="paypal"> + <input type="hidden" name="cmd" value="_s-xclick"/> + <input type="hidden" name="hosted_button_id" value="3FVHS5FGUY7CC"/> + </form> + + </body> +</html> + Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/internals.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/internals.html (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/internals.html 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,381 @@ +<!doctype html> +<html> + <head> + <title>CodeMirror: Internals</title> + <link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Droid+Sans|Droid+Sans:bold"/> + <link rel="stylesheet" type="text/css" href="css/docs.css"/> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> + <style>dl dl {margin: 0;}</style> + </head> + <body> + +<h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMirror</a></h1> + +<pre class="grey"> +<img src="css/baboon.png" class="logo" alt="logo"/>/* (Re-) Implementing A Syntax- + Highlighting Editor in JavaScript */ +</pre> + +<div class="clear"><div class="leftbig blk"> + +<p style="font-size: 85%" id="intro"> + <strong>Topic:</strong> JavaScript, code editor implementation<br> + <strong>Author:</strong> Marijn Haverbeke<br> + <strong>Date:</strong> March 2nd 2011 +</p> + +<p>This is a followup to +my <a href="http://codemirror.net/story.html">Brutal Odyssey to the +Dark Side of the DOM Tree</a> story. That one describes the +mind-bending process of implementing (what would become) CodeMirror 1. +This one describes the internals of CodeMirror 2, a complete rewrite +and rethink of the old code base. I wanted to give this piece another +Hunter Thompson copycat subtitle, but somehow that would be out of +place—the process this time around was one of straightforward +engineering, requiring no serious mind-bending whatsoever.</p> + +<p>So, what is wrong with CodeMirror 1? I'd estimate, by mailing list +activity and general search-engine presence, that it has been +integrated into about a thousand systems by now. The most prominent +one, since a few weeks, +being <a href="http://googlecode.blogspot.com/2011/01/make-quick-fixes-quicker-on-google.h…">Google +code's project hosting</a>. It works, and it's being used widely.</a> + +<p>Still, I did not start replacing it because I was bored. CodeMirror +1 was heavily reliant on <code>designMode</code> +or <code>contentEditable</code> (depending on the browser). Neither of +these are well specified (HTML5 tries +to <a href="http://www.w3.org/TR/html5/editing.html#contenteditable">specify</a> +their basics), and, more importantly, they tend to be one of the more +obscure and buggy areas of browser functionality—CodeMirror, by using +this functionality in a non-typical way, was constantly running up +against browser bugs. WebKit wouldn't show an empty line at the end of +the document, and in some releases would suddenly get unbearably slow. +Firefox would show the cursor in the wrong place. Internet Explorer +would insist on linkifying everything that looked like a URL or email +address, a behaviour that can't be turned off. Some bugs I managed to +work around (which was often a frustrating, painful process), others, +such as the Firefox cursor placement, I gave up on, and had to tell +user after user that they were known problems, but not something I +could help.</p> + +<p>Also, there is the fact that <code>designMode</code> (which seemed +to be less buggy than <code>contentEditable</code> in Webkit and +Firefox, and was thus used by CodeMirror 1 in those browsers) requires +a frame. Frames are another tricky area. It takes some effort to +prevent getting tripped up by domain restrictions, they don't +initialize synchronously, behave strangely in response to the back +button, and, on several browsers, can't be moved around the DOM +without having them re-initialize. They did provide a very nice way to +namespace the library, though—CodeMirror 1 could freely pollute the +namespace inside the frame.</p> + +<p>Finally, working with an editable document means working with +selection in arbitrary DOM structures. Internet Explorer (8 and +before) has an utterly different (and awkward) selection API than all +of the other browsers, and even among the different implementations of +<code>document.selection</code>, details about how exactly a selection +is represented vary quite a bit. Add to that the fact that Opera's +selection support tended to be very buggy until recently, and you can +imagine why CodeMirror 1 contains 700 lines of selection-handling +code.</p> + +<p>And that brings us to the main issue with the CodeMirror 1 +code base: The proportion of browser-bug-workarounds to real +application code was getting dangerously high. By building on top of a +few dodgy features, I put the system in a vulnerable position—any +incompatibility and bugginess in these features, I had to paper over +with my own code. Not only did I have to do some serious stunt-work to +get it to work on older browsers (as detailed in the +previous <a href="http://codemirror.net/story.html">story</a>), things +also kept breaking in newly released versions, requiring me to come up +with <em>new</em> scary hacks in order to keep up. This was starting +to lose its appeal.</p> + +<h2 id="approach">General Approach</h2> + +<p>What CodeMirror 2 does is try to sidestep most of the hairy hacks +that came up in version 1. I owe a lot to the +<a href="http://ace.ajax.org">ACE</a> editor for inspiration on how to +approach this.</p> + +<p>I absolutely did not want to be completely reliant on key events to +generate my input. Every JavaScript programmer knows that key event +information is horrible and incomplete. Some people (most awesomely +Mihai Bazon with <a href="http://ymacs.org">Ymacs</a>) have been able +to build more or less functioning editors by directly reading key +events, but it takes a lot of work (the kind of never-ending, fragile +work I described earlier), and will never be able to properly support +things like multi-keystoke international character input.</p> + +<p>So what I do is focus a hidden textarea, and let the browser +believe that the user is typing into that. What we show to the user is +a DOM structure we built to represent his document. If this is updated +quickly enough, and shows some kind of believable cursor, it feels +like a real text-input control.</p> + +<p>Another big win is that this DOM representation does not have to +span the whole document. Some CodeMirror 1 users insisted that they +needed to put a 30 thousand line XML document into CodeMirror. Putting +all that into the DOM takes a while, especially since, for some +reason, an editable DOM tree is slower than a normal one on most +browsers. If we have full control over what we show, we must only +ensure that the visible part of the document has been added, and can +do the rest only when needed. (Fortunately, the <code>onscroll</code> +event works almost the same on all browsers, and lends itself well to +displaying things only as they are scrolled into view.)</p> + +<h2 id="input">Input</h2> + +<p>ACE uses its hidden textarea only as a text input shim, and does +all cursor movement and things like text deletion itself by directly +handling key events. CodeMirror's way is to let the browser do its +thing as much as possible, and not, for example, define its own set of +key bindings. One way to do this would have been to have the whole +document inside the hidden textarea, and after each key event update +the display DOM to reflect what's in that textarea.</p> + +<p>That'd be simple, but it is not realistic. For even medium-sized +document the editor would be constantly munging huge strings, and get +terribly slow. What CodeMirror 2 does is put the current selection, +along with an extra line on the top and on the bottom, into the +textarea.</p> + +<p>This means that the arrow keys (and their ctrl-variations), home, +end, etcetera, do not have to be handled specially. We just read the +cursor position in the textarea, and update our cursor to match it. +Also, copy and paste work pretty much for free, and people get their +native key bindings, without any special work on my part. For example, +I have emacs key bindings configured for Chrome and Firefox. There is +no way for a script to detect this.</p> + +<p>Of course, since only a small part of the document sits in the +textarea, keys like page up and ctrl-end won't do the right thing. +CodeMirror is catching those events and handling them itself.</p> + +<h2 id="selection">Selection</h2> + +<p>Getting and setting the selection range of a textarea in modern +browsers is trivial—you just use the <code>selectionStart</code> +and <code>selectionEnd</code> properties. On IE you have to do some +insane stuff with temporary ranges and compensating for the fact that +moving the selection by a 'character' will treat \r\n as a single +character, but even there it is possible to build functions that +reliably set and get the selection range.</p> + +<p>But consider this typical case: When I'm somewhere in my document, +press shift, and press the up arrow, something gets selected. Then, if +I, still holding shift, press the up arrow again, the top of my +selection is adjusted. The selection remembers where its <em>head</em> +and its <em>anchor</em> are, and moves the head when we shift-move. +This is a generally accepted property of selections, and done right by +every editing component built in the past twenty years.</p> + +<p>But not something that the browser selection APIs expose.</p> + +<p>Great. So when someone creates an 'upside-down' selection, the next +time CodeMirror has to update the textarea, it'll re-create the +selection as an 'upside-up' selection, with the anchor at the top, and +the next cursor motion will behave in an unexpected way—our second +up-arrow press in the example above will not do anything, since it is +interpreted in exactly the same way as the first.</p> + +<p>No problem. We'll just, ehm, detect that the selection is +upside-down (you can tell by the way it was created), and then, when +an upside-down selection is present, and a cursor-moving key is +pressed in combination with shift, we quickly collapse the selection +in the textarea to its start, allow the key to take effect, and then +combine its new head with its old anchor to get the <em>real</em> +selection.</p> + +<p>In short, scary hacks could not be avoided entirely in CodeMirror +2.</p> + +<p>And, the observant reader might ask, how do you even know that a +key combo is a cursor-moving combo, if you claim you support any +native key bindings? Well, we don't, but we can learn. The editor +keeps a set known cursor-movement combos (initialized to the +predictable defaults), and updates this set when it observes that +pressing a certain key had (only) the effect of moving the cursor. +This, of course, doesn't work if the first time the key is used was +for extending an inverted selection, but it works most of the +time.</p> + +<h2 id="update">Intelligent Updating</h2> + +<p>One thing that always comes up when you have a complicated internal +state that's reflected in some user-visible external representation +(in this case, the displayed code and the textarea's content) is +keeping the two in sync. The naive way is to just update the display +every time you change your state, but this is not only error prone +(you'll forget), it also easily leads to duplicate work on big, +composite operations. Then you start passing around flags indicating +whether the display should be updated in an attempt to be efficient +again and, well, at that point you might as well give up completely.</p> + +<p>I did go down that road, but then switched to a much simpler model: +simply keep track of all the things that have been changed during an +action, and then, only at the end, use this information to update the +user-visible display.</p> + +<p>CodeMirror uses a concept of <em>operations</em>, which start by +calling a specific set-up function that clears the state and end by +calling another function that reads this state and does the required +updating. Most event handlers, and all the user-visible methods that +change state are wrapped like this. There's a method +called <code>operation</code> that accepts a function, and returns +another function that wraps the given function as an operation.</p> + +<p>It's trivial to extend this (as CodeMirror does) to detect nesting, +and, when an operation is started inside an operation, simply +increment the nesting count, and only do the updating when this count +reaches zero again.</p> + +<p>If we have a set of changed ranges and know the currently shown +range, we can (with some awkward code to deal with the fact that +changes can add and remove lines, so we're dealing with a changing +coordinate system) construct a map of the ranges that were left +intact. We can then compare this map with the part of the document +that's currently visible (based on scroll offset and editor height) to +determine whether something needs to be updated.</p> + +<p>CodeMirror uses two update algorithms—a full refresh, where it just +discards the whole part of the DOM that contains the edited text and +rebuilds it, and a patch algorithm, where it uses the information +about changed and intact ranges to update only the out-of-date parts +of the DOM. When more than 30 percent (which is the current heuristic, +might change) of the lines need to be updated, the full refresh is +chosen (since it's faster to do than painstakingly finding and +updating all the changed lines), in the other case it does the +patching (so that, if you scroll a line or select another character, +the whole screen doesn't have to be re-rendered).</p> + +<p>All updating uses <code>innerHTML</code> rather than direct DOM +manipulation, since that still seems to be by far the fastest way to +build documents. There's a per-line function that combines the +highlighting, <a href="manual.html#markText">marking</a>, and +selection info for that line into a snippet of HTML. The patch updater +uses this to reset individual lines, the refresh updater builds an +HTML chunk for the whole visible document at once, and then uses a +single <code>innerHTML</code> update to do the refresh.</p> + +<h2 id="parse">Parsers can be Simple</h2> + +<p>When I wrote CodeMirror 1, I +thought <a href="http://codemirror.net/story.html#parser">interruptable +parsers</a> were a hugely scary and complicated thing, and I used a +bunch of heavyweight abstractions to keep this supposed complexity +under control: parsers +were <a href="http://bob.pythonmac.org/archives/2005/07/06/iteration-in-javascript/">iterators</a> +that consumed input from another iterator, and used funny +closure-resetting tricks to copy and resume themselves.</p> + +<p>This made for a rather nice system, in that parsers formed strictly +separate modules, and could be composed in predictable ways. +Unfortunately, it was quite slow (stacking three or four iterators on +top of each other), and extremely intimidating to people not used to a +functional programming style.</p> + +<p>With a few small changes, however, we can keep all those +advantages, but simplify the API and make the whole thing less +indirect and inefficient. CodeMirror +2's <a href="manual.html#modeapi">mode API</a> uses explicit state +objects, and makes the parser/tokenizer a function that simply takes a +state and a character stream abstraction, advances the stream one +token, and returns the way the token should be styled. This state may +be copied, optionally in a mode-defined way, in order to be able to +continue a parse at a given point. Even someone who's never touched a +lambda in his life can understand this approach. Additionally, far +fewer objects are allocated in the course of parsing now.</p> + +<p>The biggest speedup comes from the fact that the parsing no longer +has to touch the DOM though. In CodeMirror 1, on an older browser, you +could <em>see</em> the parser work its way through the document, +managing some twenty lines in each 50-millisecond time slice it got. It +was reading its input from the DOM, and updating the DOM as it went +along, which any experienced JavaScript programmer will immediately +spot as a recipe for slowness. In CodeMirror 2, the parser usually +finishes the whole document in a single 100-millisecond time slice—it +manages some 1500 lines during that time on Chrome. All it has to do +is munge strings, so there is no real reason for it to be slow +anymore.</p> + +<h2 id="summary">What Gives?</h2> + +<p>Given all this, what can you expect from CodeMirror 2? First, the +good:</p> + +<ul> + +<li><strong>Small.</strong> the base library is some 32k when minified +now, 12k when gzipped. It's smaller than its own logo.</li> + +<li><strong>Lightweight.</strong> CodeMirror 2 initializes very +quickly, and does almost no work when it is not focused. This means +you can treat it almost like a textarea, have multiple instances on a +page without trouble.</li> + +<li><strong>Huge document support.</strong> Since highlighting is +really fast, and no DOM structure is being built for non-visible +content, you don't have to worry about locking up your browser when a +user enters a megabyte-sized document.</li> + +<li><strong>Extended API.</strong> Some things kept coming up in the +mailing list, such as marking pieces of text or lines, which were +extremely hard to do with CodeMirror 1. The new version has proper +support for these built in.</li> + +<li><strong>Tab support.</strong> Tabs inside editable documents were, +for some reason, a no-go. At least six different people announced they +were going to add tab support to CodeMirror 1, none survived (I mean, +none delivered a working version). CodeMirror 2 no longer removes tabs +from your document.</li> + +<li><strong>Sane styling.</strong> <code>iframe</code> nodes aren't +really known for respecting document flow. Now that an editor instance +is a plain <code>div</code> element, it is much easier to size it to +fit the surrounding elements. You don't even have to make it scroll if +you do not <a href="demo/resize.html">want to</a>.</li> + +</ul> + +<p>Then, the bad:</p> + +<ul> + +<li><strong>No line-wrapping.</strong> I'd have liked to get +line-wrapping to work, but it doesn't match the model I'm using very +well. It is important that cursor movement in the textarea matches +what you see on the screen, and it seems to be impossible to have the +lines wrapped the same in the textarea and the normal DOM.</li> + +<li><strong>Some cursor flakiness.</strong> The textarea hack does not +really do justice to the complexity of cursor handling—a selection is +typically more than just an offset into a string. For example, if you +use the up and down arrow keys to move to a shorter line and then +back, you'll end up in your old position in most editor controls, but +CodeMirror 2 currently doesn't remember the 'real' cursor column in +this case. These can be worked around on a case-by-case basis, but +I haven't put much energy into that yet.</li> + +</ul> + +</div><div class="rightsmall blk"> + + <h2>Contents</h2> + + <ul> + <li><a href="#intro">Introduction</a></li> + <li><a href="#approach">General Approach</a></li> + <li><a href="#input">Input</a></li> + <li><a href="#selection">Selection</a></li> + <li><a href="#update">Intelligent Updating</a></li> + <li><a href="#parse">Parsing</a></li> + <li><a href="#summary">What Gives?</a></li> + </ul> + +</div></div> + +<div style="height: 2em"> </div> + +</body></html> Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/lib/codemirror.css =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/lib/codemirror.css (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/lib/codemirror.css 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,64 @@ +.CodeMirror { + line-height: 1em; + font-family: monospace; +} + +.CodeMirror-scroll { + overflow: auto; + height: 300px; +} + +.CodeMirror-gutter { + position: absolute; left: 0; top: 0; + background-color: #f7f7f7; + border-right: 1px solid #eee; + min-width: 2em; + height: 100%; +} +.CodeMirror-gutter-text { + color: #aaa; + text-align: right; + padding: .4em .2em .4em .4em; +} +.CodeMirror-lines { + padding: .4em; +} + +.CodeMirror pre { + -moz-border-radius: 0; + -webkit-border-radius: 0; + -o-border-radius: 0; + border-radius: 0; + border-width: 0; margin: 0; padding: 0; background: transparent; + font-family: inherit; + font-size: inherit; + padding: 0; margin: 0; + white-space: pre; + word-wrap: normal; +} + +.CodeMirror textarea { + font-family: inherit !important; + font-size: inherit !important; +} + +.CodeMirror-cursor { + z-index: 10; + position: absolute; + visibility: hidden; + border-left: 1px solid black !important; +} +.CodeMirror-focused .CodeMirror-cursor { + visibility: visible; +} + +span.CodeMirror-selected { + background: #ccc !important; + color: HighlightText !important; +} +.CodeMirror-focused span.CodeMirror-selected { + background: Highlight !important; +} + +.CodeMirror-matchingbracket {color: #0f0 !important;} +.CodeMirror-nonmatchingbracket {color: #f22 !important;} Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/lib/codemirror.js =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/lib/codemirror.js (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/lib/codemirror.js 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,2071 @@ +// All functions that need access to the editor's state live inside +// the CodeMirror function. Below that, at the bottom of the file, +// some utilities are defined. + +// CodeMirror is the only global var we claim +var CodeMirror = (function() { + // This is the function that produces an editor instance. It's + // closure is used to store the editor state. + function CodeMirror(place, givenOptions) { + // Determine effective options based on given values and defaults. + var options = {}, defaults = CodeMirror.defaults; + for (var opt in defaults) + if (defaults.hasOwnProperty(opt)) + options[opt] = (givenOptions && givenOptions.hasOwnProperty(opt) ? givenOptions : defaults)[opt]; + + var targetDocument = options["document"]; + // The element in which the editor lives. + var wrapper = targetDocument.createElement("div"); + wrapper.className = "CodeMirror"; + // This mess creates the base DOM structure for the editor. + wrapper.innerHTML = + '<div style="overflow: hidden; position: relative; width: 1px; height: 0px;">' + // Wraps and hides input textarea + '<textarea style="position: absolute; width: 2px;" wrap="off"></textarea></div>' + + '<div class="CodeMirror-scroll cm-s-' + options.theme + '">' + + '<div style="position: relative">' + // Set to the height of the text, causes scrolling + '<div style="position: absolute; height: 0; width: 0; overflow: hidden;"></div>' + + '<div style="position: relative">' + // Moved around its parent to cover visible view + '<div class="CodeMirror-gutter"><div class="CodeMirror-gutter-text"></div></div>' + + // Provides positioning relative to (visible) text origin + '<div class="CodeMirror-lines"><div style="position: relative">' + + '<pre class="CodeMirror-cursor"> </pre>' + // Absolutely positioned blinky cursor + '<div></div>' + // This DIV contains the actual code + '</div></div></div></div></div>'; + if (place.appendChild) place.appendChild(wrapper); else place(wrapper); + // I've never seen more elegant code in my life. + var inputDiv = wrapper.firstChild, input = inputDiv.firstChild, + scroller = wrapper.lastChild, code = scroller.firstChild, + measure = code.firstChild, mover = measure.nextSibling, + gutter = mover.firstChild, gutterText = gutter.firstChild, + lineSpace = gutter.nextSibling.firstChild, + cursor = lineSpace.firstChild, lineDiv = cursor.nextSibling; + if (options.tabindex != null) input.tabindex = options.tabindex; + if (!options.gutter && !options.lineNumbers) gutter.style.display = "none"; + + // Delayed object wrap timeouts, making sure only one is active. blinker holds an interval. + var poll = new Delayed(), highlight = new Delayed(), blinker; + + // mode holds a mode API object. lines an array of Line objects + // (see Line constructor), work an array of lines that should be + // parsed, and history the undo history (instance of History + // constructor). + var mode, lines = [new Line("")], work, history = new History(), focused; + loadMode(); + // The selection. These are always maintained to point at valid + // positions. Inverted is used to remember that the user is + // selecting bottom-to-top. + var sel = {from: {line: 0, ch: 0}, to: {line: 0, ch: 0}, inverted: false}; + // Selection-related flags. shiftSelecting obviously tracks + // whether the user is holding shift. reducedSelection is a hack + // to get around the fact that we can't create inverted + // selections. See below. + var shiftSelecting, reducedSelection, lastDoubleClick; + // Variables used by startOperation/endOperation to track what + // happened during the operation. + var updateInput, changes, textChanged, selectionChanged, leaveInputAlone; + // Current visible range (may be bigger than the view window). + var showingFrom = 0, showingTo = 0, lastHeight = 0, curKeyId = null; + // editing will hold an object describing the things we put in the + // textarea, to help figure out whether something changed. + // bracketHighlighted is used to remember that a backet has been + // marked. + var editing, bracketHighlighted; + // Tracks the maximum line length so that the horizontal scrollbar + // can be kept static when scrolling. + var maxLine = ""; + + // Initialize the content. Somewhat hacky (delayed prepareInput) + // to work around browser issues. + operation(function(){setValue(options.value || ""); updateInput = false;})(); + setTimeout(prepareInput, 20); + + // Register our event handlers. + connect(scroller, "mousedown", operation(onMouseDown)); + // Gecko browsers fire contextmenu *after* opening the menu, at + // which point we can't mess with it anymore. Context menu is + // handled in onMouseDown for Gecko. + if (!gecko) connect(scroller, "contextmenu", operation(onContextMenu)); + connect(code, "dblclick", operation(onDblClick)); + connect(scroller, "scroll", function() {updateDisplay([]); if (options.onScroll) options.onScroll(instance);}); + connect(window, "resize", function() {updateDisplay(true);}); + connect(input, "keyup", operation(onKeyUp)); + connect(input, "keydown", operation(onKeyDown)); + connect(input, "keypress", operation(onKeyPress)); + connect(input, "focus", onFocus); + connect(input, "blur", onBlur); + + connect(scroller, "dragenter", function(e){e.stop();}); + connect(scroller, "dragover", function(e){e.stop();}); + connect(scroller, "drop", operation(onDrop)); + connect(scroller, "paste", function(){focusInput(); fastPoll();}); + connect(input, "paste", function(){fastPoll();}); + connect(input, "cut", function(){fastPoll();}); + + // IE throws unspecified error in certain cases, when + // trying to access activeElement before onload + var hasFocus; try { hasFocus = (targetDocument.activeElement == input); } catch(e) { } + if (hasFocus) onFocus(); + else onBlur(); + + function isLine(l) {return l >= 0 && l < lines.length;} + // The instance object that we'll return. Mostly calls out to + // local functions in the CodeMirror function. Some do some extra + // range checking and/or clipping. operation is used to wrap the + // call so that changes it makes are tracked, and the display is + // updated afterwards. + var instance = { + getValue: getValue, + setValue: operation(setValue), + getSelection: getSelection, + replaceSelection: operation(replaceSelection), + focus: function(){focusInput(); onFocus(); prepareInput(); fastPoll();}, + setOption: function(option, value) { + options[option] = value; + if (option == "lineNumbers" || option == "gutter") gutterChanged(); + else if (option == "mode" || option == "indentUnit") loadMode(); + else if (option == "readOnly" && value == "nocursor") input.blur(); + else if (option == "theme") scroller.className = scroller.className.replace(/cm-s-\w+/, "cm-s-" + value); + }, + getOption: function(option) {return options[option];}, + undo: operation(undo), + redo: operation(redo), + indentLine: operation(function(n) {if (isLine(n)) indentLine(n, "smart");}), + historySize: function() {return {undo: history.done.length, redo: history.undone.length};}, + matchBrackets: operation(function(){matchBrackets(true);}), + getTokenAt: function(pos) { + pos = clipPos(pos); + return lines[pos.line].getTokenAt(mode, getStateBefore(pos.line), pos.ch); + }, + cursorCoords: function(start){ + if (start == null) start = sel.inverted; + return pageCoords(start ? sel.from : sel.to); + }, + charCoords: function(pos){return pageCoords(clipPos(pos));}, + coordsChar: function(coords) { + var off = eltOffset(lineSpace); + var line = clipLine(Math.min(lines.length - 1, showingFrom + Math.floor((coords.y - off.top) / lineHeight()))); + return clipPos({line: line, ch: charFromX(clipLine(line), coords.x - off.left)}); + }, + getSearchCursor: function(query, pos, caseFold) {return new SearchCursor(query, pos, caseFold);}, + markText: operation(function(a, b, c){return operation(markText(a, b, c));}), + setMarker: addGutterMarker, + clearMarker: removeGutterMarker, + setLineClass: operation(setLineClass), + lineInfo: lineInfo, + addWidget: function(pos, node, scroll) { + var pos = localCoords(clipPos(pos), true); + node.style.top = (showingFrom * lineHeight() + pos.yBot + paddingTop()) + "px"; + node.style.left = (pos.x + paddingLeft()) + "px"; + code.appendChild(node); + if (scroll) + scrollIntoView(pos.x, pos.yBot, pos.x + node.offsetWidth, pos.yBot + node.offsetHeight); + }, + + lineCount: function() {return lines.length;}, + getCursor: function(start) { + if (start == null) start = sel.inverted; + return copyPos(start ? sel.from : sel.to); + }, + somethingSelected: function() {return !posEq(sel.from, sel.to);}, + setCursor: operation(function(line, ch) { + if (ch == null && typeof line.line == "number") setCursor(line.line, line.ch); + else setCursor(line, ch); + }), + setSelection: operation(function(from, to) {setSelection(clipPos(from), clipPos(to || from));}), + getLine: function(line) {if (isLine(line)) return lines[line].text;}, + setLine: operation(function(line, text) { + if (isLine(line)) replaceRange(text, {line: line, ch: 0}, {line: line, ch: lines[line].text.length}); + }), + removeLine: operation(function(line) { + if (isLine(line)) replaceRange("", {line: line, ch: 0}, clipPos({line: line+1, ch: 0})); + }), + replaceRange: operation(replaceRange), + getRange: function(from, to) {return getRange(clipPos(from), clipPos(to));}, + + operation: function(f){return operation(f)();}, + refresh: function(){updateDisplay(true);}, + getInputField: function(){return input;}, + getWrapperElement: function(){return wrapper;} + }; + + function setValue(code) { + history = null; + var top = {line: 0, ch: 0}; + updateLines(top, {line: lines.length - 1, ch: lines[lines.length-1].text.length}, + splitLines(code), top, top); + history = new History(); + } + function getValue(code) { + var text = []; + for (var i = 0, l = lines.length; i < l; ++i) + text.push(lines[i].text); + return text.join("\n"); + } + + function onMouseDown(e) { + var ld = lastDoubleClick; lastDoubleClick = null; + // First, see if this is a click in the gutter + for (var n = e.target(); n != wrapper; n = n.parentNode) + if (n.parentNode == gutterText) { + if (options.onGutterClick) + options.onGutterClick(instance, indexOf(gutterText.childNodes, n) + showingFrom); + return e.stop(); + } + + if (gecko && e.button() == 3) onContextMenu(e); + if (e.button() != 1) return; + // For button 1, if it was clicked inside the editor + // (posFromMouse returning non-null), we have to adjust the + // selection. + var start = posFromMouse(e), last = start, going; + if (!start) {if (e.target() == scroller) e.stop(); return;} + + if (!focused) onFocus(); + e.stop(); + if (ld && +new Date - ld < 400) return selectLine(start.line); + + setCursor(start.line, start.ch, true); + // And then we have to see if it's a drag event, in which case + // the dragged-over text must be selected. + function end() { + focusInput(); + updateInput = true; + move(); up(); + } + function extend(e) { + var cur = posFromMouse(e, true); + if (cur && !posEq(cur, last)) { + if (!focused) onFocus(); + last = cur; + setSelectionUser(start, cur); + updateInput = false; + var visible = visibleLines(); + if (cur.line >= visible.to || cur.line < visible.from) + going = setTimeout(operation(function(){extend(e);}), 150); + } + } + + var move = connect(targetDocument, "mousemove", operation(function(e) { + clearTimeout(going); + e.stop(); + extend(e); + }), true); + var up = connect(targetDocument, "mouseup", operation(function(e) { + clearTimeout(going); + var cur = posFromMouse(e); + if (cur) setSelectionUser(start, cur); + e.stop(); + end(); + }), true); + } + function onDblClick(e) { + var pos = posFromMouse(e); + if (!pos) return; + selectWordAt(pos); + e.stop(); + lastDoubleClick = +new Date; + } + function onDrop(e) { + var pos = posFromMouse(e, true), files = e.e.dataTransfer.files; + if (!pos || options.readOnly) return; + if (files && files.length && window.FileReader && window.File) { + var n = files.length, text = Array(n), read = 0; + for (var i = 0; i < n; ++i) loadFile(files[i], i); + function loadFile(file, i) { + var reader = new FileReader; + reader.onload = function() { + text[i] = reader.result; + if (++read == n) replaceRange(text.join(""), clipPos(pos), clipPos(pos)); + }; + reader.readAsText(file); + } + } + else { + try { + var text = e.e.dataTransfer.getData("Text"); + if (text) replaceRange(text, pos, pos); + } + catch(e){} + } + } + function onKeyDown(e) { + if (!focused) onFocus(); + + var code = e.e.keyCode; + // IE does strange things with escape. + if (ie && code == 27) { e.e.returnValue = false; } + // Tries to detect ctrl on non-mac, cmd on mac. + var mod = (mac ? e.e.metaKey : e.e.ctrlKey) && !e.e.altKey, anyMod = e.e.ctrlKey || e.e.altKey || e.e.metaKey; + if (code == 16 || e.e.shiftKey) shiftSelecting = shiftSelecting || (sel.inverted ? sel.to : sel.from); + else shiftSelecting = null; + // First give onKeyEvent option a chance to handle this. + if (options.onKeyEvent && options.onKeyEvent(instance, addStop(e.e))) return; + + if (code == 33 || code == 34) {scrollPage(code == 34); return e.stop();} // page up/down + if (mod && ((code == 36 || code == 35) || // ctrl-home/end + mac && (code == 38 || code == 40))) { // cmd-up/down + scrollEnd(code == 36 || code == 38); return e.stop(); + } + if (mod && code == 65) {selectAll(); return e.stop();} // ctrl-a + if (!options.readOnly) { + if (!anyMod && code == 13) {return;} // enter + if (!anyMod && code == 9 && handleTab(e.e.shiftKey)) return e.stop(); // tab + if (mod && code == 90) {undo(); return e.stop();} // ctrl-z + if (mod && ((e.e.shiftKey && code == 90) || code == 89)) {redo(); return e.stop();} // ctrl-shift-z, ctrl-y + } + + // Key id to use in the movementKeys map. We also pass it to + // fastPoll in order to 'self learn'. We need this because + // reducedSelection, the hack where we collapse the selection to + // its start when it is inverted and a movement key is pressed + // (and later restore it again), shouldn't be used for + // non-movement keys. + curKeyId = (mod ? "c" : "") + code; + if (sel.inverted && movementKeys.hasOwnProperty(curKeyId)) { + var range = selRange(input); + if (range) { + reducedSelection = {anchor: range.start}; + setSelRange(input, range.start, range.start); + } + } + fastPoll(curKeyId); + } + function onKeyUp(e) { + if (options.onKeyEvent && options.onKeyEvent(instance, addStop(e.e))) return; + if (reducedSelection) { + reducedSelection = null; + updateInput = true; + } + if (e.e.keyCode == 16) shiftSelecting = null; + } + function onKeyPress(e) { + if (options.onKeyEvent && options.onKeyEvent(instance, addStop(e.e))) return; + if (options.electricChars && mode.electricChars) { + var ch = String.fromCharCode(e.e.charCode == null ? e.e.keyCode : e.e.charCode); + if (mode.electricChars.indexOf(ch) > -1) + setTimeout(operation(function() {indentLine(sel.to.line, "smart");}), 50); + } + var code = e.e.keyCode; + // Re-stop tab and enter. Necessary on some browsers. + if (code == 13) {if (!options.readOnly) handleEnter(); e.stop();} + else if (!e.e.ctrlKey && !e.e.altKey && !e.e.metaKey && code == 9 && options.tabMode != "default") e.stop(); + else fastPoll(curKeyId); + } + + function onFocus() { + if (options.readOnly == "nocursor") return; + if (!focused && options.onFocus) options.onFocus(instance); + focused = true; + slowPoll(); + if (wrapper.className.search(/\bCodeMirror-focused\b/) == -1) + wrapper.className += " CodeMirror-focused"; + restartBlink(); + } + function onBlur() { + if (focused && options.onBlur) options.onBlur(instance); + clearInterval(blinker); + shiftSelecting = null; + focused = false; + wrapper.className = wrapper.className.replace(" CodeMirror-focused", ""); + } + + // Replace the range from from to to by the strings in newText. + // Afterwards, set the selection to selFrom, selTo. + function updateLines(from, to, newText, selFrom, selTo) { + if (history) { + var old = []; + for (var i = from.line, e = to.line + 1; i < e; ++i) old.push(lines[i].text); + history.addChange(from.line, newText.length, old); + while (history.done.length > options.undoDepth) history.done.shift(); + } + updateLinesNoUndo(from, to, newText, selFrom, selTo); + if (newText.length < 5) + highlightLines(from.line, from.line + newText.length) + } + function unredoHelper(from, to) { + var change = from.pop(); + if (change) { + var replaced = [], end = change.start + change.added; + for (var i = change.start; i < end; ++i) replaced.push(lines[i].text); + to.push({start: change.start, added: change.old.length, old: replaced}); + var pos = clipPos({line: change.start + change.old.length - 1, + ch: editEnd(replaced[replaced.length-1], change.old[change.old.length-1])}); + updateLinesNoUndo({line: change.start, ch: 0}, {line: end - 1, ch: lines[end-1].text.length}, change.old, pos, pos); + } + } + function undo() {unredoHelper(history.done, history.undone);} + function redo() {unredoHelper(history.undone, history.done);} + + function updateLinesNoUndo(from, to, newText, selFrom, selTo) { + var recomputeMaxLength = false, maxLineLength = maxLine.length; + for (var i = from.line; i <= to.line; ++i) { + if (lines[i].text.length == maxLineLength) {recomputeMaxLength = true; break;} + } + + var nlines = to.line - from.line, firstLine = lines[from.line], lastLine = lines[to.line]; + // First adjust the line structure, taking some care to leave highlighting intact. + if (firstLine == lastLine) { + if (newText.length == 1) + firstLine.replace(from.ch, to.ch, newText[0]); + else { + lastLine = firstLine.split(to.ch, newText[newText.length-1]); + var spliceargs = [from.line + 1, nlines]; + firstLine.replace(from.ch, firstLine.text.length, newText[0]); + for (var i = 1, e = newText.length - 1; i < e; ++i) spliceargs.push(new Line(newText[i])); + spliceargs.push(lastLine); + lines.splice.apply(lines, spliceargs); + } + } + else if (newText.length == 1) { + firstLine.replace(from.ch, firstLine.text.length, newText[0] + lastLine.text.slice(to.ch)); + lines.splice(from.line + 1, nlines); + } + else { + var spliceargs = [from.line + 1, nlines - 1]; + firstLine.replace(from.ch, firstLine.text.length, newText[0]); + lastLine.replace(0, to.ch, newText[newText.length-1]); + for (var i = 1, e = newText.length - 1; i < e; ++i) spliceargs.push(new Line(newText[i])); + lines.splice.apply(lines, spliceargs); + } + + + for (var i = from.line, e = i + newText.length; i < e; ++i) { + var l = lines[i].text; + if (l.length > maxLineLength) { + maxLine = l; maxLineLength = l.length; + recomputeMaxLength = false; + } + } + if (recomputeMaxLength) { + maxLineLength = 0; maxLine = ""; + for (var i = 0, e = lines.length; i < e; ++i) { + var l = lines[i].text; + if (l.length > maxLineLength) { + maxLineLength = l.length; maxLine = l; + } + } + } + + // Add these lines to the work array, so that they will be + // highlighted. Adjust work lines if lines were added/removed. + var newWork = [], lendiff = newText.length - nlines - 1; + for (var i = 0, l = work.length; i < l; ++i) { + var task = work[i]; + if (task < from.line) newWork.push(task); + else if (task > to.line) newWork.push(task + lendiff); + } + if (newText.length) newWork.push(from.line); + work = newWork; + startWorker(100); + // Remember that these lines changed, for updating the display + changes.push({from: from.line, to: to.line + 1, diff: lendiff}); + textChanged = {from: from, to: to, text: newText}; + + // Update the selection + function updateLine(n) {return n <= Math.min(to.line, to.line + lendiff) ? n : n + lendiff;} + setSelection(selFrom, selTo, updateLine(sel.from.line), updateLine(sel.to.line)); + + // Make sure the scroll-size div has the correct height. + code.style.height = (lines.length * lineHeight() + 2 * paddingTop()) + "px"; + } + + function replaceRange(code, from, to) { + from = clipPos(from); + if (!to) to = from; else to = clipPos(to); + code = splitLines(code); + function adjustPos(pos) { + if (posLess(pos, from)) return pos; + if (!posLess(to, pos)) return end; + var line = pos.line + code.length - (to.line - from.line) - 1; + var ch = pos.ch; + if (pos.line == to.line) + ch += code[code.length-1].length - (to.ch - (to.line == from.line ? from.ch : 0)); + return {line: line, ch: ch}; + } + var end; + replaceRange1(code, from, to, function(end1) { + end = end1; + return {from: adjustPos(sel.from), to: adjustPos(sel.to)}; + }); + return end; + } + function replaceSelection(code, collapse) { + replaceRange1(splitLines(code), sel.from, sel.to, function(end) { + if (collapse == "end") return {from: end, to: end}; + else if (collapse == "start") return {from: sel.from, to: sel.from}; + else return {from: sel.from, to: end}; + }); + } + function replaceRange1(code, from, to, computeSel) { + var endch = code.length == 1 ? code[0].length + from.ch : code[code.length-1].length; + var newSel = computeSel({line: from.line + code.length - 1, ch: endch}); + updateLines(from, to, code, newSel.from, newSel.to); + } + + function getRange(from, to) { + var l1 = from.line, l2 = to.line; + if (l1 == l2) return lines[l1].text.slice(from.ch, to.ch); + var code = [lines[l1].text.slice(from.ch)]; + for (var i = l1 + 1; i < l2; ++i) code.push(lines[i].text); + code.push(lines[l2].text.slice(0, to.ch)); + return code.join("\n"); + } + function getSelection() { + return getRange(sel.from, sel.to); + } + + var pollingFast = false; // Ensures slowPoll doesn't cancel fastPoll + function slowPoll() { + if (pollingFast) return; + poll.set(2000, function() { + startOperation(); + readInput(); + if (focused) slowPoll(); + endOperation(); + }); + } + function fastPoll(keyId) { + var missed = false; + pollingFast = true; + function p() { + startOperation(); + var changed = readInput(); + if (changed == "moved" && keyId) movementKeys[keyId] = true; + if (!changed && !missed) {missed = true; poll.set(80, p);} + else {pollingFast = false; slowPoll();} + endOperation(); + } + poll.set(20, p); + } + + // Inspects the textarea, compares its state (content, selection) + // to the data in the editing variable, and updates the editor + // content or cursor if something changed. + function readInput() { + if (leaveInputAlone) return; + var changed = false, text = input.value, sr = selRange(input); + if (!sr) return false; + var changed = editing.text != text, rs = reducedSelection; + var moved = changed || sr.start != editing.start || sr.end != (rs ? editing.start : editing.end); + if (!moved && !rs) return false; + if (changed) { + shiftSelecting = reducedSelection = null; + if (options.readOnly) {updateInput = true; return "changed";} + } + + // Compute selection start and end based on start/end offsets in textarea + function computeOffset(n, startLine) { + var pos = 0; + for (;;) { + var found = text.indexOf("\n", pos); + if (found == -1 || (text.charAt(found-1) == "\r" ? found - 1 : found) >= n) + return {line: startLine, ch: n - pos}; + ++startLine; + pos = found + 1; + } + } + var from = computeOffset(sr.start, editing.from), + to = computeOffset(sr.end, editing.from); + // Here we have to take the reducedSelection hack into account, + // so that you can, for example, press shift-up at the start of + // your selection and have the right thing happen. + if (rs) { + var head = sr.start == rs.anchor ? to : from; + var tail = shiftSelecting ? sel.to : sr.start == rs.anchor ? from : to; + if (sel.inverted = posLess(head, tail)) { from = head; to = tail; } + else { reducedSelection = null; from = tail; to = head; } + } + + // In some cases (cursor on same line as before), we don't have + // to update the textarea content at all. + if (from.line == to.line && from.line == sel.from.line && from.line == sel.to.line && !shiftSelecting) + updateInput = false; + + // Magic mess to extract precise edited range from the changed + // string. + if (changed) { + var start = 0, end = text.length, len = Math.min(end, editing.text.length); + var c, line = editing.from, nl = -1; + while (start < len && (c = text.charAt(start)) == editing.text.charAt(start)) { + ++start; + if (c == "\n") {line++; nl = start;} + } + var ch = nl > -1 ? start - nl : start, endline = editing.to - 1, edend = editing.text.length; + for (;;) { + c = editing.text.charAt(edend); + if (text.charAt(end) != c) {++end; ++edend; break;} + if (c == "\n") endline--; + if (edend <= start || end <= start) break; + --end; --edend; + } + var nl = editing.text.lastIndexOf("\n", edend - 1), endch = nl == -1 ? edend : edend - nl - 1; + updateLines({line: line, ch: ch}, {line: endline, ch: endch}, splitLines(text.slice(start, end)), from, to); + if (line != endline || from.line != line) updateInput = true; + } + else setSelection(from, to); + + editing.text = text; editing.start = sr.start; editing.end = sr.end; + return changed ? "changed" : moved ? "moved" : false; + } + + // Set the textarea content and selection range to match the + // editor state. + function prepareInput() { + var text = []; + var from = Math.max(0, sel.from.line - 1), to = Math.min(lines.length, sel.to.line + 2); + for (var i = from; i < to; ++i) text.push(lines[i].text); + text = input.value = text.join(lineSep); + var startch = sel.from.ch, endch = sel.to.ch; + for (var i = from; i < sel.from.line; ++i) + startch += lineSep.length + lines[i].text.length; + for (var i = from; i < sel.to.line; ++i) + endch += lineSep.length + lines[i].text.length; + editing = {text: text, from: from, to: to, start: startch, end: endch}; + setSelRange(input, startch, reducedSelection ? startch : endch); + } + function focusInput() { + if (options.readOnly != "nocursor") input.focus(); + } + + function scrollCursorIntoView() { + var cursor = localCoords(sel.inverted ? sel.from : sel.to); + return scrollIntoView(cursor.x, cursor.y, cursor.x, cursor.yBot); + } + function scrollIntoView(x1, y1, x2, y2) { + var pl = paddingLeft(), pt = paddingTop(), lh = lineHeight(); + y1 += pt; y2 += pt; x1 += pl; x2 += pl; + var screen = scroller.clientHeight, screentop = scroller.scrollTop, scrolled = false, result = true; + if (y1 < screentop) {scroller.scrollTop = Math.max(0, y1 - 2*lh); scrolled = true;} + else if (y2 > screentop + screen) {scroller.scrollTop = y2 + lh - screen; scrolled = true;} + + var screenw = scroller.clientWidth, screenleft = scroller.scrollLeft; + if (x1 < screenleft) { + if (x1 < 50) x1 = 0; + scroller.scrollLeft = Math.max(0, x1 - 10); + scrolled = true; + } + else if (x2 > screenw + screenleft) { + scroller.scrollLeft = x2 + 10 - screenw; + scrolled = true; + if (x2 > code.clientWidth) result = false; + } + if (scrolled && options.onScroll) options.onScroll(instance); + return result; + } + + function visibleLines() { + var lh = lineHeight(), top = scroller.scrollTop - paddingTop(); + return {from: Math.min(lines.length, Math.max(0, Math.floor(top / lh))), + to: Math.min(lines.length, Math.ceil((top + scroller.clientHeight) / lh))}; + } + // Uses a set of changes plus the current scroll position to + // determine which DOM updates have to be made, and makes the + // updates. + function updateDisplay(changes) { + if (!scroller.clientWidth) { + showingFrom = showingTo = 0; + return; + } + // First create a range of theoretically intact lines, and punch + // holes in that using the change info. + var intact = changes === true ? [] : [{from: showingFrom, to: showingTo, domStart: 0}]; + for (var i = 0, l = changes.length || 0; i < l; ++i) { + var change = changes[i], intact2 = [], diff = change.diff || 0; + for (var j = 0, l2 = intact.length; j < l2; ++j) { + var range = intact[j]; + if (change.to <= range.from) + intact2.push({from: range.from + diff, to: range.to + diff, domStart: range.domStart}); + else if (range.to <= change.from) + intact2.push(range); + else { + if (change.from > range.from) + intact2.push({from: range.from, to: change.from, domStart: range.domStart}) + if (change.to < range.to) + intact2.push({from: change.to + diff, to: range.to + diff, + domStart: range.domStart + (change.to - range.from)}); + } + } + intact = intact2; + } + + // Then, determine which lines we'd want to see, and which + // updates have to be made to get there. + var visible = visibleLines(); + var from = Math.min(showingFrom, Math.max(visible.from - 3, 0)), + to = Math.min(lines.length, Math.max(showingTo, visible.to + 3)), + updates = [], domPos = 0, domEnd = showingTo - showingFrom, pos = from, changedLines = 0; + + for (var i = 0, l = intact.length; i < l; ++i) { + var range = intact[i]; + if (range.to <= from) continue; + if (range.from >= to) break; + if (range.domStart > domPos || range.from > pos) { + updates.push({from: pos, to: range.from, domSize: range.domStart - domPos, domStart: domPos}); + changedLines += range.from - pos; + } + pos = range.to; + domPos = range.domStart + (range.to - range.from); + } + if (domPos != domEnd || pos != to) { + changedLines += Math.abs(to - pos); + updates.push({from: pos, to: to, domSize: domEnd - domPos, domStart: domPos}); + } + + if (!updates.length) return; + lineDiv.style.display = "none"; + // If more than 30% of the screen needs update, just do a full + // redraw (which is quicker than patching) + if (changedLines > (visible.to - visible.from) * .3) + refreshDisplay(from = Math.max(visible.from - 10, 0), to = Math.min(visible.to + 7, lines.length)); + // Otherwise, only update the stuff that needs updating. + else + patchDisplay(updates); + lineDiv.style.display = ""; + + // Position the mover div to align with the lines it's supposed + // to be showing (which will cover the visible display) + var different = from != showingFrom || to != showingTo || lastHeight != scroller.clientHeight; + showingFrom = from; showingTo = to; + mover.style.top = (from * lineHeight()) + "px"; + if (different) { + lastHeight = scroller.clientHeight; + code.style.height = (lines.length * lineHeight() + 2 * paddingTop()) + "px"; + updateGutter(); + } + + var textWidth = stringWidth(maxLine); + lineSpace.style.width = textWidth > scroller.clientWidth ? textWidth + "px" : ""; + + // Since this is all rather error prone, it is honoured with the + // only assertion in the whole file. + if (lineDiv.childNodes.length != showingTo - showingFrom) + throw new Error("BAD PATCH! " + JSON.stringify(updates) + " size=" + (showingTo - showingFrom) + + " nodes=" + lineDiv.childNodes.length); + updateCursor(); + } + + function refreshDisplay(from, to) { + var html = [], start = {line: from, ch: 0}, inSel = posLess(sel.from, start) && !posLess(sel.to, start); + for (var i = from; i < to; ++i) { + var ch1 = null, ch2 = null; + if (inSel) { + ch1 = 0; + if (sel.to.line == i) {inSel = false; ch2 = sel.to.ch;} + } + else if (sel.from.line == i) { + if (sel.to.line == i) {ch1 = sel.from.ch; ch2 = sel.to.ch;} + else {inSel = true; ch1 = sel.from.ch;} + } + html.push(lines[i].getHTML(ch1, ch2, true)); + } + lineDiv.innerHTML = html.join(""); + } + function patchDisplay(updates) { + // Slightly different algorithm for IE (badInnerHTML), since + // there .innerHTML on PRE nodes is dumb, and discards + // whitespace. + var sfrom = sel.from.line, sto = sel.to.line, off = 0, + scratch = badInnerHTML && targetDocument.createElement("div"); + for (var i = 0, e = updates.length; i < e; ++i) { + var rec = updates[i]; + var extra = (rec.to - rec.from) - rec.domSize; + var nodeAfter = lineDiv.childNodes[rec.domStart + rec.domSize + off] || null; + if (badInnerHTML) + for (var j = Math.max(-extra, rec.domSize); j > 0; --j) + lineDiv.removeChild(nodeAfter ? nodeAfter.previousSibling : lineDiv.lastChild); + else if (extra) { + for (var j = Math.max(0, extra); j > 0; --j) + lineDiv.insertBefore(targetDocument.createElement("pre"), nodeAfter); + for (var j = Math.max(0, -extra); j > 0; --j) + lineDiv.removeChild(nodeAfter ? nodeAfter.previousSibling : lineDiv.lastChild); + } + var node = lineDiv.childNodes[rec.domStart + off], inSel = sfrom < rec.from && sto >= rec.from; + for (var j = rec.from; j < rec.to; ++j) { + var ch1 = null, ch2 = null; + if (inSel) { + ch1 = 0; + if (sto == j) {inSel = false; ch2 = sel.to.ch;} + } + else if (sfrom == j) { + if (sto == j) {ch1 = sel.from.ch; ch2 = sel.to.ch;} + else {inSel = true; ch1 = sel.from.ch;} + } + if (badInnerHTML) { + scratch.innerHTML = lines[j].getHTML(ch1, ch2, true); + lineDiv.insertBefore(scratch.firstChild, nodeAfter); + } + else { + node.innerHTML = lines[j].getHTML(ch1, ch2, false); + node.className = lines[j].className || ""; + node = node.nextSibling; + } + } + off += extra; + } + } + + function updateGutter() { + if (!options.gutter && !options.lineNumbers) return; + var hText = mover.offsetHeight, hEditor = scroller.clientHeight; + gutter.style.height = (hText - hEditor < 2 ? hEditor : hText) + "px"; + var html = []; + for (var i = showingFrom; i < Math.max(showingTo, showingFrom + 1); ++i) { + var marker = lines[i].gutterMarker; + var text = options.lineNumbers ? i + options.firstLineNumber : null; + if (marker && marker.text) + text = marker.text.replace("%N%", text != null ? text : ""); + else if (text == null) + text = "\u00a0"; + html.push((marker && marker.style ? '<pre class="' + marker.style + '">' : "<pre>"), text, "</pre>"); + } + gutter.style.display = "none"; + gutterText.innerHTML = html.join(""); + var minwidth = String(lines.length).length, firstNode = gutterText.firstChild, val = eltText(firstNode), pad = ""; + while (val.length + pad.length < minwidth) pad += "\u00a0"; + if (pad) firstNode.insertBefore(targetDocument.createTextNode(pad), firstNode.firstChild); + gutter.style.display = ""; + lineSpace.style.marginLeft = gutter.offsetWidth + "px"; + } + function updateCursor() { + var head = sel.inverted ? sel.from : sel.to, lh = lineHeight(); + var x = charX(head.line, head.ch) + "px", y = (head.line - showingFrom) * lh + "px"; + inputDiv.style.top = (head.line * lh - scroller.scrollTop) + "px"; + if (posEq(sel.from, sel.to)) { + cursor.style.top = y; cursor.style.left = x; + cursor.style.display = ""; + } + else cursor.style.display = "none"; + } + + function setSelectionUser(from, to) { + var sh = shiftSelecting && clipPos(shiftSelecting); + if (sh) { + if (posLess(sh, from)) from = sh; + else if (posLess(to, sh)) to = sh; + } + setSelection(from, to); + } + // Update the selection. Last two args are only used by + // updateLines, since they have to be expressed in the line + // numbers before the update. + function setSelection(from, to, oldFrom, oldTo) { + if (posEq(sel.from, from) && posEq(sel.to, to)) return; + if (posLess(to, from)) {var tmp = to; to = from; from = tmp;} + + if (posEq(from, to)) sel.inverted = false; + else if (posEq(from, sel.to)) sel.inverted = false; + else if (posEq(to, sel.from)) sel.inverted = true; + + // Some ugly logic used to only mark the lines that actually did + // see a change in selection as changed, rather than the whole + // selected range. + if (oldFrom == null) {oldFrom = sel.from.line; oldTo = sel.to.line;} + if (posEq(from, to)) { + if (!posEq(sel.from, sel.to)) + changes.push({from: oldFrom, to: oldTo + 1}); + } + else if (posEq(sel.from, sel.to)) { + changes.push({from: from.line, to: to.line + 1}); + } + else { + if (!posEq(from, sel.from)) { + if (from.line < oldFrom) + changes.push({from: from.line, to: Math.min(to.line, oldFrom) + 1}); + else + changes.push({from: oldFrom, to: Math.min(oldTo, from.line) + 1}); + } + if (!posEq(to, sel.to)) { + if (to.line < oldTo) + changes.push({from: Math.max(oldFrom, from.line), to: oldTo + 1}); + else + changes.push({from: Math.max(from.line, oldTo), to: to.line + 1}); + } + } + sel.from = from; sel.to = to; + selectionChanged = true; + } + function setCursor(line, ch, user) { + var pos = clipPos({line: line, ch: ch || 0}); + (user ? setSelectionUser : setSelection)(pos, pos); + } + + function clipLine(n) {return Math.max(0, Math.min(n, lines.length-1));} + function clipPos(pos) { + if (pos.line < 0) return {line: 0, ch: 0}; + if (pos.line >= lines.length) return {line: lines.length-1, ch: lines[lines.length-1].text.length}; + var ch = pos.ch, linelen = lines[pos.line].text.length; + if (ch == null || ch > linelen) return {line: pos.line, ch: linelen}; + else if (ch < 0) return {line: pos.line, ch: 0}; + else return pos; + } + + function scrollPage(down) { + var linesPerPage = Math.floor(scroller.clientHeight / lineHeight()), head = sel.inverted ? sel.from : sel.to; + setCursor(head.line + (Math.max(linesPerPage - 1, 1) * (down ? 1 : -1)), head.ch, true); + } + function scrollEnd(top) { + var pos = top ? {line: 0, ch: 0} : {line: lines.length - 1, ch: lines[lines.length-1].text.length}; + setSelectionUser(pos, pos); + } + function selectAll() { + var endLine = lines.length - 1; + setSelection({line: 0, ch: 0}, {line: endLine, ch: lines[endLine].text.length}); + } + function selectWordAt(pos) { + var line = lines[pos.line].text; + var start = pos.ch, end = pos.ch; + while (start > 0 && /\w/.test(line.charAt(start - 1))) --start; + while (end < line.length && /\w/.test(line.charAt(end))) ++end; + setSelectionUser({line: pos.line, ch: start}, {line: pos.line, ch: end}); + } + function selectLine(line) { + setSelectionUser({line: line, ch: 0}, {line: line, ch: lines[line].text.length}); + } + function handleEnter() { + replaceSelection("\n", "end"); + if (options.enterMode != "flat") + indentLine(sel.from.line, options.enterMode == "keep" ? "prev" : "smart"); + } + function handleTab(shift) { + shiftSelecting = null; + switch (options.tabMode) { + case "default": + return false; + case "indent": + for (var i = sel.from.line, e = sel.to.line; i <= e; ++i) indentLine(i, "smart"); + break; + case "classic": + if (posEq(sel.from, sel.to)) { + if (shift) indentLine(sel.from.line, "smart"); + else replaceSelection("\t", "end"); + break; + } + case "shift": + for (var i = sel.from.line, e = sel.to.line; i <= e; ++i) indentLine(i, shift ? "subtract" : "add"); + break; + } + return true; + } + + function indentLine(n, how) { + if (how == "smart") { + if (!mode.indent) how = "prev"; + else var state = getStateBefore(n); + } + + var line = lines[n], curSpace = line.indentation(), curSpaceString = line.text.match(/^\s*/)[0], indentation; + if (how == "prev") { + if (n) indentation = lines[n-1].indentation(); + else indentation = 0; + } + else if (how == "smart") indentation = mode.indent(state, line.text.slice(curSpaceString.length)); + else if (how == "add") indentation = curSpace + options.indentUnit; + else if (how == "subtract") indentation = curSpace - options.indentUnit; + indentation = Math.max(0, indentation); + var diff = indentation - curSpace; + + if (!diff) { + if (sel.from.line != n && sel.to.line != n) return; + var indentString = curSpaceString; + } + else { + var indentString = "", pos = 0; + if (options.indentWithTabs) + for (var i = Math.floor(indentation / tabSize); i; --i) {pos += tabSize; indentString += "\t";} + while (pos < indentation) {++pos; indentString += " ";} + } + + replaceRange(indentString, {line: n, ch: 0}, {line: n, ch: curSpaceString.length}); + } + + function loadMode() { + mode = CodeMirror.getMode(options, options.mode); + for (var i = 0, l = lines.length; i < l; ++i) + lines[i].stateAfter = null; + work = [0]; + startWorker(); + } + function gutterChanged() { + var visible = options.gutter || options.lineNumbers; + gutter.style.display = visible ? "" : "none"; + if (visible) updateGutter(); + else lineDiv.parentNode.style.marginLeft = 0; + } + + function markText(from, to, className) { + from = clipPos(from); to = clipPos(to); + var accum = []; + function add(line, from, to, className) { + var line = lines[line], mark = line.addMark(from, to, className); + mark.line = line; + accum.push(mark); + } + if (from.line == to.line) add(from.line, from.ch, to.ch, className); + else { + add(from.line, from.ch, null, className); + for (var i = from.line + 1, e = to.line; i < e; ++i) + add(i, 0, null, className); + add(to.line, 0, to.ch, className); + } + changes.push({from: from.line, to: to.line + 1}); + return function() { + var start, end; + for (var i = 0; i < accum.length; ++i) { + var mark = accum[i], found = indexOf(lines, mark.line); + mark.line.removeMark(mark); + if (found > -1) { + if (start == null) start = found; + end = found; + } + } + if (start != null) changes.push({from: start, to: end + 1}); + }; + } + + function addGutterMarker(line, text, className) { + if (typeof line == "number") line = lines[clipLine(line)]; + line.gutterMarker = {text: text, style: className}; + updateGutter(); + return line; + } + function removeGutterMarker(line) { + if (typeof line == "number") line = lines[clipLine(line)]; + line.gutterMarker = null; + updateGutter(); + } + function setLineClass(line, className) { + if (typeof line == "number") { + var no = line; + line = lines[clipLine(line)]; + } + else { + var no = indexOf(lines, line); + if (no == -1) return null; + } + if (line.className != className) { + line.className = className; + changes.push({from: no, to: no + 1}); + } + return line; + } + + function lineInfo(line) { + if (typeof line == "number") { + var n = line; + line = lines[line]; + if (!line) return null; + } + else { + var n = indexOf(lines, line); + if (n == -1) return null; + } + var marker = line.gutterMarker; + return {line: n, text: line.text, markerText: marker && marker.text, markerClass: marker && marker.style}; + } + + function stringWidth(str) { + measure.innerHTML = "<pre><span>x</span></pre>"; + measure.firstChild.firstChild.firstChild.nodeValue = str; + return measure.firstChild.firstChild.offsetWidth || 10; + } + // These are used to go from pixel positions to character + // positions, taking varying character widths into account. + function charX(line, pos) { + if (pos == 0) return 0; + measure.innerHTML = "<pre><span>" + lines[line].getHTML(null, null, false, pos) + "</span></pre>"; + return measure.firstChild.firstChild.offsetWidth; + } + function charFromX(line, x) { + if (x <= 0) return 0; + var lineObj = lines[line], text = lineObj.text; + function getX(len) { + measure.innerHTML = "<pre><span>" + lineObj.getHTML(null, null, false, len) + "</span></pre>"; + return measure.firstChild.firstChild.offsetWidth; + } + var from = 0, fromX = 0, to = text.length, toX; + // Guess a suitable upper bound for our search. + var estimated = Math.min(to, Math.ceil(x / stringWidth("x"))); + for (;;) { + var estX = getX(estimated); + if (estX <= x && estimated < to) estimated = Math.min(to, Math.ceil(estimated * 1.2)); + else {toX = estX; to = estimated; break;} + } + if (x > toX) return to; + // Try to guess a suitable lower bound as well. + estimated = Math.floor(to * 0.8); estX = getX(estimated); + if (estX < x) {from = estimated; fromX = estX;} + // Do a binary search between these bounds. + for (;;) { + if (to - from <= 1) return (toX - x > x - fromX) ? from : to; + var middle = Math.ceil((from + to) / 2), middleX = getX(middle); + if (middleX > x) {to = middle; toX = middleX;} + else {from = middle; fromX = middleX;} + } + } + + function localCoords(pos, inLineWrap) { + var lh = lineHeight(), line = pos.line - (inLineWrap ? showingFrom : 0); + return {x: charX(pos.line, pos.ch), y: line * lh, yBot: (line + 1) * lh}; + } + function pageCoords(pos) { + var local = localCoords(pos, true), off = eltOffset(lineSpace); + return {x: off.left + local.x, y: off.top + local.y, yBot: off.top + local.yBot}; + } + + function lineHeight() { + var nlines = lineDiv.childNodes.length; + if (nlines) return (lineDiv.offsetHeight / nlines) || 1; + measure.innerHTML = "<pre>x</pre>"; + return measure.firstChild.offsetHeight || 1; + } + function paddingTop() {return lineSpace.offsetTop;} + function paddingLeft() {return lineSpace.offsetLeft;} + + function posFromMouse(e, liberal) { + var offW = eltOffset(scroller, true), x = e.e.clientX, y = e.e.clientY; + // This is a mess of a heuristic to try and determine whether a + // scroll-bar was clicked or not, and to return null if one was + // (and !liberal). + if (!liberal && (x - offW.left > scroller.clientWidth || y - offW.top > scroller.clientHeight)) + return null; + var offL = eltOffset(lineSpace, true); + var line = showingFrom + Math.floor((y - offL.top) / lineHeight()); + return clipPos({line: line, ch: charFromX(clipLine(line), x - offL.left)}); + } + function onContextMenu(e) { + var pos = posFromMouse(e); + if (!pos || window.opera) return; // Opera is difficult. + if (posEq(sel.from, sel.to) || posLess(pos, sel.from) || !posLess(pos, sel.to)) + setCursor(pos.line, pos.ch); + + var oldCSS = input.style.cssText; + input.style.cssText = "position: fixed; width: 30px; height: 30px; top: " + (e.pageY() - 1) + + "px; left: " + (e.pageX() - 1) + "px; z-index: 1000; background: white; " + + "border-width: 0; outline: none; overflow: hidden; opacity: .05;"; + var val = input.value = getSelection(); + focusInput(); + setSelRange(input, 0, input.value.length); + leaveInputAlone = true; + function rehide() { + if (input.value != val) operation(replaceSelection)(input.value, "end"); + input.style.cssText = oldCSS; + leaveInputAlone = false; + prepareInput(); + slowPoll(); + } + + if (gecko) { + e.stop() + var mouseup = connect(window, "mouseup", function() { + mouseup(); + setTimeout(rehide, 20); + }, true); + } + else { + setTimeout(rehide, 50); + } + } + + // Cursor-blinking + function restartBlink() { + clearInterval(blinker); + var on = true; + cursor.style.visibility = ""; + blinker = setInterval(function() { + cursor.style.visibility = (on = !on) ? "" : "hidden"; + }, 650); + } + + var matching = {"(": ")>", ")": "(<", "[": "]>", "]": "[<", "{": "}>", "}": "{<"}; + function matchBrackets(autoclear) { + var head = sel.inverted ? sel.from : sel.to, line = lines[head.line], pos = head.ch - 1; + var match = (pos >= 0 && matching[line.text.charAt(pos)]) || matching[line.text.charAt(++pos)]; + if (!match) return; + var ch = match.charAt(0), forward = match.charAt(1) == ">", d = forward ? 1 : -1, st = line.styles; + for (var off = pos + 1, i = 0, e = st.length; i < e; i+=2) + if ((off -= st[i].length) <= 0) {var style = st[i+1]; break;} + + var stack = [line.text.charAt(pos)], re = /[(){}[\]]/; + function scan(line, from, to) { + if (!line.text) return; + var st = line.styles, pos = forward ? 0 : line.text.length - 1, cur; + for (var i = forward ? 0 : st.length - 2, e = forward ? st.length : -2; i != e; i += 2*d) { + var text = st[i]; + if (st[i+1] != null && st[i+1] != style) {pos += d * text.length; continue;} + for (var j = forward ? 0 : text.length - 1, te = forward ? text.length : -1; j != te; j += d, pos+=d) { + if (pos >= from && pos < to && re.test(cur = text.charAt(j))) { + var match = matching[cur]; + if (match.charAt(1) == ">" == forward) stack.push(cur); + else if (stack.pop() != match.charAt(0)) return {pos: pos, match: false}; + else if (!stack.length) return {pos: pos, match: true}; + } + } + } + } + for (var i = head.line, e = forward ? Math.min(i + 50, lines.length) : Math.max(-1, i - 50); i != e; i+=d) { + var line = lines[i], first = i == head.line; + var found = scan(line, first && forward ? pos + 1 : 0, first && !forward ? pos : line.text.length); + if (found) { + var style = found.match ? "CodeMirror-matchingbracket" : "CodeMirror-nonmatchingbracket"; + var one = markText({line: head.line, ch: pos}, {line: head.line, ch: pos+1}, style), + two = markText({line: i, ch: found.pos}, {line: i, ch: found.pos + 1}, style); + var clear = operation(function(){one(); two();}); + if (autoclear) setTimeout(clear, 800); + else bracketHighlighted = clear; + break; + } + } + } + + // Finds the line to start with when starting a parse. Tries to + // find a line with a stateAfter, so that it can start with a + // valid state. If that fails, it returns the line with the + // smallest indentation, which tends to need the least context to + // parse correctly. + function findStartLine(n) { + var minindent, minline; + for (var search = n, lim = n - 40; search > lim; --search) { + if (search == 0) return 0; + var line = lines[search-1]; + if (line.stateAfter) return search; + var indented = line.indentation(); + if (minline == null || minindent > indented) { + minline = search; + minindent = indented; + } + } + return minline; + } + function getStateBefore(n) { + var start = findStartLine(n), state = start && lines[start-1].stateAfter; + if (!state) state = startState(mode); + else state = copyState(mode, state); + for (var i = start; i < n; ++i) { + var line = lines[i]; + line.highlight(mode, state); + line.stateAfter = copyState(mode, state); + } + if (!lines[n].stateAfter) work.push(n); + return state; + } + function highlightLines(start, end) { + var state = getStateBefore(start); + for (var i = start; i < end; ++i) { + var line = lines[i]; + line.highlight(mode, state); + line.stateAfter = copyState(mode, state); + } + } + function highlightWorker() { + var end = +new Date + options.workTime; + var foundWork = work.length; + while (work.length) { + if (!lines[showingFrom].stateAfter) var task = showingFrom; + else var task = work.pop(); + if (task >= lines.length) continue; + var start = findStartLine(task), state = start && lines[start-1].stateAfter; + if (state) state = copyState(mode, state); + else state = startState(mode); + + var unchanged = 0; + for (var i = start, l = lines.length; i < l; ++i) { + var line = lines[i], hadState = line.stateAfter; + if (+new Date > end) { + work.push(i); + startWorker(options.workDelay); + changes.push({from: task, to: i}); + return; + } + var changed = line.highlight(mode, state); + line.stateAfter = copyState(mode, state); + if (changed || !hadState) unchanged = 0; + else if (++unchanged > 3) break; + } + changes.push({from: task, to: i}); + } + if (foundWork && options.onHighlightComplete) + options.onHighlightComplete(instance); + } + function startWorker(time) { + if (!work.length) return; + highlight.set(time, operation(highlightWorker)); + } + + // Operations are used to wrap changes in such a way that each + // change won't have to update the cursor and display (which would + // be awkward, slow, and error-prone), but instead updates are + // batched and then all combined and executed at once. + function startOperation() { + updateInput = null; changes = []; textChanged = selectionChanged = false; + } + function endOperation() { + var reScroll = false; + if (selectionChanged) reScroll = !scrollCursorIntoView(); + if (changes.length) updateDisplay(changes); + else if (selectionChanged) updateCursor(); + if (reScroll) scrollCursorIntoView(); + if (selectionChanged) restartBlink(); + + // updateInput can be set to a boolean value to force/prevent an + // update. + if (!leaveInputAlone && (updateInput === true || (updateInput !== false && selectionChanged))) + prepareInput(); + + if (selectionChanged && options.matchBrackets) + setTimeout(operation(function() { + if (bracketHighlighted) {bracketHighlighted(); bracketHighlighted = null;} + matchBrackets(false); + }), 20); + var tc = textChanged; // textChanged can be reset by cursoractivity callback + if (selectionChanged && options.onCursorActivity) + options.onCursorActivity(instance); + if (tc && options.onChange && instance) + options.onChange(instance, tc); + } + var nestedOperation = 0; + function operation(f) { + return function() { + if (!nestedOperation++) startOperation(); + try {var result = f.apply(this, arguments);} + finally {if (!--nestedOperation) endOperation();} + return result; + }; + } + + function SearchCursor(query, pos, caseFold) { + this.atOccurrence = false; + if (caseFold == null) caseFold = typeof query == "string" && query == query.toLowerCase(); + + if (pos && typeof pos == "object") pos = clipPos(pos); + else pos = {line: 0, ch: 0}; + this.pos = {from: pos, to: pos}; + + // The matches method is filled in based on the type of query. + // It takes a position and a direction, and returns an object + // describing the next occurrence of the query, or null if no + // more matches were found. + if (typeof query != "string") // Regexp match + this.matches = function(reverse, pos) { + if (reverse) { + var line = lines[pos.line].text.slice(0, pos.ch), match = line.match(query), start = 0; + while (match) { + var ind = line.indexOf(match[0]); + start += ind; + line = line.slice(ind + 1); + var newmatch = line.match(query); + if (newmatch) match = newmatch; + else break; + start++; + } + } + else { + var line = lines[pos.line].text.slice(pos.ch), match = line.match(query), + start = match && pos.ch + line.indexOf(match[0]); + } + if (match) + return {from: {line: pos.line, ch: start}, + to: {line: pos.line, ch: start + match[0].length}, + match: match}; + }; + else { // String query + if (caseFold) query = query.toLowerCase(); + var fold = caseFold ? function(str){return str.toLowerCase();} : function(str){return str;}; + var target = query.split("\n"); + // Different methods for single-line and multi-line queries + if (target.length == 1) + this.matches = function(reverse, pos) { + var line = fold(lines[pos.line].text), len = query.length, match; + if (reverse ? (pos.ch >= len && (match = line.lastIndexOf(query, pos.ch - len)) != -1) + : (match = line.indexOf(query, pos.ch)) != -1) + return {from: {line: pos.line, ch: match}, + to: {line: pos.line, ch: match + len}}; + }; + else + this.matches = function(reverse, pos) { + var ln = pos.line, idx = (reverse ? target.length - 1 : 0), match = target[idx], line = fold(lines[ln].text); + var offsetA = (reverse ? line.indexOf(match) + match.length : line.lastIndexOf(match)); + if (reverse ? offsetA >= pos.ch || offsetA != match.length + : offsetA <= pos.ch || offsetA != line.length - match.length) + return; + for (;;) { + if (reverse ? !ln : ln == lines.length - 1) return; + line = fold(lines[ln += reverse ? -1 : 1].text); + match = target[reverse ? --idx : ++idx]; + if (idx > 0 && idx < target.length - 1) { + if (line != match) return; + else continue; + } + var offsetB = (reverse ? line.lastIndexOf(match) : line.indexOf(match) + match.length); + if (reverse ? offsetB != line.length - match.length : offsetB != match.length) + return; + var start = {line: pos.line, ch: offsetA}, end = {line: ln, ch: offsetB}; + return {from: reverse ? end : start, to: reverse ? start : end}; + } + }; + } + } + + SearchCursor.prototype = { + findNext: function() {return this.find(false);}, + findPrevious: function() {return this.find(true);}, + + find: function(reverse) { + var self = this, pos = clipPos(reverse ? this.pos.from : this.pos.to); + function savePosAndFail(line) { + var pos = {line: line, ch: 0}; + self.pos = {from: pos, to: pos}; + self.atOccurrence = false; + return false; + } + + for (;;) { + if (this.pos = this.matches(reverse, pos)) { + this.atOccurrence = true; + return this.pos.match || true; + } + if (reverse) { + if (!pos.line) return savePosAndFail(0); + pos = {line: pos.line-1, ch: lines[pos.line-1].text.length}; + } + else { + if (pos.line == lines.length - 1) return savePosAndFail(lines.length); + pos = {line: pos.line+1, ch: 0}; + } + } + }, + + from: function() {if (this.atOccurrence) return copyPos(this.pos.from);}, + to: function() {if (this.atOccurrence) return copyPos(this.pos.to);} + }; + + for (var ext in extensions) + if (extensions.propertyIsEnumerable(ext) && + !instance.propertyIsEnumerable(ext)) + instance[ext] = extensions[ext]; + return instance; + } // (end of function CodeMirror) + + // The default configuration options. + CodeMirror.defaults = { + value: "", + mode: null, + theme: "default", + indentUnit: 2, + indentWithTabs: false, + tabMode: "classic", + enterMode: "indent", + electricChars: true, + onKeyEvent: null, + lineNumbers: false, + gutter: false, + firstLineNumber: 1, + readOnly: false, + onChange: null, + onCursorActivity: null, + onGutterClick: null, + onHighlightComplete: null, + onFocus: null, onBlur: null, onScroll: null, + matchBrackets: false, + workTime: 100, + workDelay: 200, + undoDepth: 40, + tabindex: null, + document: window.document + }; + + // Known modes, by name and by MIME + var modes = {}, mimeModes = {}; + CodeMirror.defineMode = function(name, mode) { + if (!CodeMirror.defaults.mode && name != "null") CodeMirror.defaults.mode = name; + modes[name] = mode; + }; + CodeMirror.defineMIME = function(mime, spec) { + mimeModes[mime] = spec; + }; + CodeMirror.getMode = function(options, spec) { + if (typeof spec == "string" && mimeModes.hasOwnProperty(spec)) + spec = mimeModes[spec]; + if (typeof spec == "string") + var mname = spec, config = {}; + else if (spec != null) + var mname = spec.name, config = spec; + var mfactory = modes[mname]; + if (!mfactory) { + if (window.console) console.warn("No mode " + mname + " found, falling back to plain text."); + return CodeMirror.getMode(options, "text/plain"); + } + return mfactory(options, config || {}); + } + CodeMirror.listModes = function() { + var list = []; + for (var m in modes) + if (modes.propertyIsEnumerable(m)) list.push(m); + return list; + }; + CodeMirror.listMIMEs = function() { + var list = []; + for (var m in mimeModes) + if (mimeModes.propertyIsEnumerable(m)) list.push(m); + return list; + }; + + var extensions = {}; + CodeMirror.defineExtension = function(name, func) { + extensions[name] = func; + }; + + CodeMirror.fromTextArea = function(textarea, options) { + if (!options) options = {}; + options.value = textarea.value; + if (!options.tabindex && textarea.tabindex) + options.tabindex = textarea.tabindex; + + function save() {textarea.value = instance.getValue();} + if (textarea.form) { + // Deplorable hack to make the submit method do the right thing. + var rmSubmit = connect(textarea.form, "submit", save, true); + if (typeof textarea.form.submit == "function") { + var realSubmit = textarea.form.submit; + function wrappedSubmit() { + save(); + textarea.form.submit = realSubmit; + textarea.form.submit(); + textarea.form.submit = wrappedSubmit; + } + textarea.form.submit = wrappedSubmit; + } + } + + textarea.style.display = "none"; + var instance = CodeMirror(function(node) { + textarea.parentNode.insertBefore(node, textarea.nextSibling); + }, options); + instance.save = save; + instance.toTextArea = function() { + save(); + textarea.parentNode.removeChild(instance.getWrapperElement()); + textarea.style.display = ""; + if (textarea.form) { + rmSubmit(); + if (typeof textarea.form.submit == "function") + textarea.form.submit = realSubmit; + } + }; + return instance; + }; + + // Utility functions for working with state. Exported because modes + // sometimes need to do this. + function copyState(mode, state) { + if (state === true) return state; + if (mode.copyState) return mode.copyState(state); + var nstate = {}; + for (var n in state) { + var val = state[n]; + if (val instanceof Array) val = val.concat([]); + nstate[n] = val; + } + return nstate; + } + CodeMirror.startState = startState; + function startState(mode, a1, a2) { + return mode.startState ? mode.startState(a1, a2) : true; + } + CodeMirror.copyState = copyState; + + // The character stream used by a mode's parser. + function StringStream(string) { + this.pos = this.start = 0; + this.string = string; + } + StringStream.prototype = { + eol: function() {return this.pos >= this.string.length;}, + sol: function() {return this.pos == 0;}, + peek: function() {return this.string.charAt(this.pos);}, + next: function() { + if (this.pos < this.string.length) + return this.string.charAt(this.pos++); + }, + eat: function(match) { + var ch = this.string.charAt(this.pos); + if (typeof match == "string") var ok = ch == match; + else var ok = ch && (match.test ? match.test(ch) : match(ch)); + if (ok) {++this.pos; return ch;} + }, + eatWhile: function(match) { + var start = this.start; + while (this.eat(match)){} + return this.pos > start; + }, + eatSpace: function() { + var start = this.pos; + while (/[\s\u00a0]/.test(this.string.charAt(this.pos))) ++this.pos; + return this.pos > start; + }, + skipToEnd: function() {this.pos = this.string.length;}, + skipTo: function(ch) { + var found = this.string.indexOf(ch, this.pos); + if (found > -1) {this.pos = found; return true;} + }, + backUp: function(n) {this.pos -= n;}, + column: function() {return countColumn(this.string, this.start);}, + indentation: function() {return countColumn(this.string);}, + match: function(pattern, consume, caseInsensitive) { + if (typeof pattern == "string") { + function cased(str) {return caseInsensitive ? str.toLowerCase() : str;} + if (cased(this.string).indexOf(cased(pattern), this.pos) == this.pos) { + if (consume !== false) this.pos += pattern.length; + return true; + } + } + else { + var match = this.string.slice(this.pos).match(pattern); + if (match && consume !== false) this.pos += match[0].length; + return match; + } + }, + current: function(){return this.string.slice(this.start, this.pos);} + }; + CodeMirror.StringStream = StringStream; + + // Line objects. These hold state related to a line, including + // highlighting info (the styles array). + function Line(text, styles) { + this.styles = styles || [text, null]; + this.stateAfter = null; + this.text = text; + this.marked = this.gutterMarker = this.className = null; + } + Line.prototype = { + // Replace a piece of a line, keeping the styles around it intact. + replace: function(from, to, text) { + var st = [], mk = this.marked; + copyStyles(0, from, this.styles, st); + if (text) st.push(text, null); + copyStyles(to, this.text.length, this.styles, st); + this.styles = st; + this.text = this.text.slice(0, from) + text + this.text.slice(to); + this.stateAfter = null; + if (mk) { + var diff = text.length - (to - from), end = this.text.length; + function fix(n) {return n <= Math.min(to, to + diff) ? n : n + diff;} + for (var i = 0; i < mk.length; ++i) { + var mark = mk[i], del = false; + if (mark.from >= end) del = true; + else {mark.from = fix(mark.from); if (mark.to != null) mark.to = fix(mark.to);} + if (del || mark.from >= mark.to) {mk.splice(i, 1); i--;} + } + } + }, + // Split a line in two, again keeping styles intact. + split: function(pos, textBefore) { + var st = [textBefore, null]; + copyStyles(pos, this.text.length, this.styles, st); + return new Line(textBefore + this.text.slice(pos), st); + }, + addMark: function(from, to, style) { + var mk = this.marked, mark = {from: from, to: to, style: style}; + if (this.marked == null) this.marked = []; + this.marked.push(mark); + this.marked.sort(function(a, b){return a.from - b.from;}); + return mark; + }, + removeMark: function(mark) { + var mk = this.marked; + if (!mk) return; + for (var i = 0; i < mk.length; ++i) + if (mk[i] == mark) {mk.splice(i, 1); break;} + }, + // Run the given mode's parser over a line, update the styles + // array, which contains alternating fragments of text and CSS + // classes. + highlight: function(mode, state) { + var stream = new StringStream(this.text), st = this.styles, pos = 0; + var changed = false, curWord = st[0], prevWord; + if (this.text == "" && mode.blankLine) mode.blankLine(state); + while (!stream.eol()) { + var style = mode.token(stream, state); + var substr = this.text.slice(stream.start, stream.pos); + stream.start = stream.pos; + if (pos && st[pos-1] == style) + st[pos-2] += substr; + else if (substr) { + if (!changed && (st[pos+1] != style || (pos && st[pos-2] != prevWord))) changed = true; + st[pos++] = substr; st[pos++] = style; + prevWord = curWord; curWord = st[pos]; + } + // Give up when line is ridiculously long + if (stream.pos > 5000) { + st[pos++] = this.text.slice(stream.pos); st[pos++] = null; + break; + } + } + if (st.length != pos) {st.length = pos; changed = true;} + if (pos && st[pos-2] != prevWord) changed = true; + // Short lines with simple highlights always count as changed, + // because they are likely to highlight the same way in various + // contexts. + return changed || (st.length < 5 && this.text.length < 10); + }, + // Fetch the parser token for a given character. Useful for hacks + // that want to inspect the mode state (say, for completion). + getTokenAt: function(mode, state, ch) { + var txt = this.text, stream = new StringStream(txt); + while (stream.pos < ch && !stream.eol()) { + stream.start = stream.pos; + var style = mode.token(stream, state); + } + return {start: stream.start, + end: stream.pos, + string: stream.current(), + className: style || null, + state: state}; + }, + indentation: function() {return countColumn(this.text);}, + // Produces an HTML fragment for the line, taking selection, + // marking, and highlighting into account. + getHTML: function(sfrom, sto, includePre, endAt) { + var html = []; + if (includePre) + html.push(this.className ? '<pre class="' + this.className + '">': "<pre>"); + function span(text, style) { + if (!text) return; + if (style) html.push('<span class="cm-', style, '">', htmlEscape(text), "</span>"); + else html.push(htmlEscape(text)); + } + var st = this.styles, allText = this.text, marked = this.marked; + if (sfrom == sto) sfrom = null; + var len = allText.length; + if (endAt != null) len = Math.min(endAt, len); + + if (!allText && endAt == null) + span(" ", sfrom != null && sto == null ? "CodeMirror-selected" : null); + else if (!marked && sfrom == null) + for (var i = 0, ch = 0; ch < len; i+=2) { + var str = st[i], l = str.length; + if (ch + l > len) str = str.slice(0, len - ch); + ch += l; + span(str, st[i+1]); + } + else { + var pos = 0, i = 0, text = "", style, sg = 0; + var markpos = -1, mark = null; + function nextMark() { + if (marked) { + markpos += 1; + mark = (markpos < marked.length) ? marked[markpos] : null; + } + } + nextMark(); + while (pos < len) { + var upto = len; + var extraStyle = ""; + if (sfrom != null) { + if (sfrom > pos) upto = sfrom; + else if (sto == null || sto > pos) { + extraStyle = " CodeMirror-selected"; + if (sto != null) upto = Math.min(upto, sto); + } + } + while (mark && mark.to != null && mark.to <= pos) nextMark(); + if (mark) { + if (mark.from > pos) upto = Math.min(upto, mark.from); + else { + extraStyle += " " + mark.style; + if (mark.to != null) upto = Math.min(upto, mark.to); + } + } + for (;;) { + var end = pos + text.length; + var apliedStyle = style; + if (extraStyle) apliedStyle = style ? style + extraStyle : extraStyle; + span(end > upto ? text.slice(0, upto - pos) : text, apliedStyle); + if (end >= upto) {text = text.slice(upto - pos); pos = upto; break;} + pos = end; + text = st[i++]; style = st[i++]; + } + } + if (sfrom != null && sto == null) span(" ", "CodeMirror-selected"); + } + if (includePre) html.push("</pre>"); + return html.join(""); + } + }; + // Utility used by replace and split above + function copyStyles(from, to, source, dest) { + for (var i = 0, pos = 0, state = 0; pos < to; i+=2) { + var part = source[i], end = pos + part.length; + if (state == 0) { + if (end > from) dest.push(part.slice(from - pos, Math.min(part.length, to - pos)), source[i+1]); + if (end >= from) state = 1; + } + else if (state == 1) { + if (end > to) dest.push(part.slice(0, to - pos), source[i+1]); + else dest.push(part, source[i+1]); + } + pos = end; + } + } + + // The history object 'chunks' changes that are made close together + // and at almost the same time into bigger undoable units. + function History() { + this.time = 0; + this.done = []; this.undone = []; + } + History.prototype = { + addChange: function(start, added, old) { + this.undone.length = 0; + var time = +new Date, last = this.done[this.done.length - 1]; + if (time - this.time > 400 || !last || + last.start > start + added || last.start + last.added < start - last.added + last.old.length) + this.done.push({start: start, added: added, old: old}); + else { + var oldoff = 0; + if (start < last.start) { + for (var i = last.start - start - 1; i >= 0; --i) + last.old.unshift(old[i]); + last.added += last.start - start; + last.start = start; + } + else if (last.start < start) { + oldoff = start - last.start; + added += oldoff; + } + for (var i = last.added - oldoff, e = old.length; i < e; ++i) + last.old.push(old[i]); + if (last.added < added) last.added = added; + } + this.time = time; + } + }; + + // Event stopping compatibility wrapper. + function stopEvent() { + if (this.preventDefault) {this.preventDefault(); this.stopPropagation();} + else {this.returnValue = false; this.cancelBubble = true;} + } + // Ensure an event has a stop method. + function addStop(event) { + if (!event.stop) event.stop = stopEvent; + return event; + } + + // Event wrapper, exposing the few operations we need. + function Event(orig) {this.e = orig;} + Event.prototype = { + stop: function() {stopEvent.call(this.e);}, + target: function() {return this.e.target || this.e.srcElement;}, + button: function() { + if (this.e.which) return this.e.which; + else if (this.e.button & 1) return 1; + else if (this.e.button & 2) return 3; + else if (this.e.button & 4) return 2; + }, + pageX: function() { + if (this.e.pageX != null) return this.e.pageX; + var doc = this.target().ownerDocument; + return this.e.clientX + doc.body.scrollLeft + doc.documentElement.scrollLeft; + }, + pageY: function() { + if (this.e.pageY != null) return this.e.pageY; + var doc = this.target().ownerDocument; + return this.e.clientY + doc.body.scrollTop + doc.documentElement.scrollTop; + } + }; + + // Event handler registration. If disconnect is true, it'll return a + // function that unregisters the handler. + function connect(node, type, handler, disconnect) { + function wrapHandler(event) {handler(new Event(event || window.event));} + if (typeof node.addEventListener == "function") { + node.addEventListener(type, wrapHandler, false); + if (disconnect) return function() {node.removeEventListener(type, wrapHandler, false);}; + } + else { + node.attachEvent("on" + type, wrapHandler); + if (disconnect) return function() {node.detachEvent("on" + type, wrapHandler);}; + } + } + + function Delayed() {this.id = null;} + Delayed.prototype = {set: function(ms, f) {clearTimeout(this.id); this.id = setTimeout(f, ms);}}; + + // Some IE versions don't preserve whitespace when setting the + // innerHTML of a PRE tag. + var badInnerHTML = (function() { + var pre = document.createElement("pre"); + pre.innerHTML = " "; return !pre.innerHTML; + })(); + + var gecko = /gecko\/\d{7}/i.test(navigator.userAgent); + var ie = /MSIE \d/.test(navigator.userAgent); + var safari = /Apple Computer/.test(navigator.vendor); + + var lineSep = "\n"; + // Feature-detect whether newlines in textareas are converted to \r\n + (function () { + var te = document.createElement("textarea"); + te.value = "foo\nbar"; + if (te.value.indexOf("\r") > -1) lineSep = "\r\n"; + }()); + + var tabSize = 8; + var mac = /Mac/.test(navigator.platform); + var movementKeys = {}; + for (var i = 35; i <= 40; ++i) + movementKeys[i] = movementKeys["c" + i] = true; + + // Counts the column offset in a string, taking tabs into account. + // Used mostly to find indentation. + function countColumn(string, end) { + if (end == null) { + end = string.search(/[^\s\u00a0]/); + if (end == -1) end = string.length; + } + for (var i = 0, n = 0; i < end; ++i) { + if (string.charAt(i) == "\t") n += tabSize - (n % tabSize); + else ++n; + } + return n; + } + + // Find the position of an element by following the offsetParent chain. + // If screen==true, it returns screen (rather than page) coordinates. + function eltOffset(node, screen) { + var doc = node.ownerDocument.body; + var x = 0, y = 0, hitDoc = false; + for (var n = node; n; n = n.offsetParent) { + x += n.offsetLeft; y += n.offsetTop; + // Fixed-position elements don't have the document in their offset chain + if (n == doc) hitDoc = true; + } + var e = screen && hitDoc ? null : doc; + for (var n = node.parentNode; n != e; n = n.parentNode) + if (n.scrollLeft != null) { x -= n.scrollLeft; y -= n.scrollTop;} + return {left: x, top: y}; + } + // Get a node's text content. + function eltText(node) { + return node.textContent || node.innerText || node.nodeValue || ""; + } + + // Operations on {line, ch} objects. + function posEq(a, b) {return a.line == b.line && a.ch == b.ch;} + function posLess(a, b) {return a.line < b.line || (a.line == b.line && a.ch < b.ch);} + function copyPos(x) {return {line: x.line, ch: x.ch};} + + function htmlEscape(str) { + return str.replace(/[<>&]/g, function(str) { + return str == "&" ? "&" : str == "<" ? "<" : ">"; + }); + } + CodeMirror.htmlEscape = htmlEscape; + + // Used to position the cursor after an undo/redo by finding the + // last edited character. + function editEnd(from, to) { + if (!to) return from ? from.length : 0; + if (!from) return to.length; + for (var i = from.length, j = to.length; i >= 0 && j >= 0; --i, --j) + if (from.charAt(i) != to.charAt(j)) break; + return j + 1; + } + + function indexOf(collection, elt) { + if (collection.indexOf) return collection.indexOf(elt); + for (var i = 0, e = collection.length; i < e; ++i) + if (collection[i] == elt) return i; + return -1; + } + + // See if "".split is the broken IE version, if so, provide an + // alternative way to split lines. + if ("\n\nb".split(/\n/).length != 3) + var splitLines = function(string) { + var pos = 0, nl, result = []; + while ((nl = string.indexOf("\n", pos)) > -1) { + result.push(string.slice(pos, string.charAt(nl-1) == "\r" ? nl - 1 : nl)); + pos = nl + 1; + } + result.push(string.slice(pos)); + return result; + }; + else + var splitLines = function(string){return string.split(/\r?\n/);}; + CodeMirror.splitLines = splitLines; + + // Sane model of finding and setting the selection in a textarea + if (window.getSelection) { + var selRange = function(te) { + try {return {start: te.selectionStart, end: te.selectionEnd};} + catch(e) {return null;} + }; + if (safari) + // On Safari, selection set with setSelectionRange are in a sort + // of limbo wrt their anchor. If you press shift-left in them, + // the anchor is put at the end, and the selection expanded to + // the left. If you press shift-right, the anchor ends up at the + // front. This is not what CodeMirror wants, so it does a + // spurious modify() call to get out of limbo. + var setSelRange = function(te, start, end) { + if (start == end) + te.setSelectionRange(start, end); + else { + te.setSelectionRange(start, end - 1); + window.getSelection().modify("extend", "forward", "character"); + } + }; + else + var setSelRange = function(te, start, end) { + try {te.setSelectionRange(start, end);} + catch(e) {} // Fails on Firefox when textarea isn't part of the document + }; + } + // IE model. Don't ask. + else { + var selRange = function(te) { + try {var range = te.ownerDocument.selection.createRange();} + catch(e) {return null;} + if (!range || range.parentElement() != te) return null; + var val = te.value, len = val.length, localRange = te.createTextRange(); + localRange.moveToBookmark(range.getBookmark()); + var endRange = te.createTextRange(); + endRange.collapse(false); + + if (localRange.compareEndPoints("StartToEnd", endRange) > -1) + return {start: len, end: len}; + + var start = -localRange.moveStart("character", -len); + for (var i = val.indexOf("\r"); i > -1 && i < start; i = val.indexOf("\r", i+1), start++) {} + + if (localRange.compareEndPoints("EndToEnd", endRange) > -1) + return {start: start, end: len}; + + var end = -localRange.moveEnd("character", -len); + for (var i = val.indexOf("\r"); i > -1 && i < end; i = val.indexOf("\r", i+1), end++) {} + return {start: start, end: end}; + }; + var setSelRange = function(te, start, end) { + var range = te.createTextRange(); + range.collapse(true); + var endrange = range.duplicate(); + var newlines = 0, txt = te.value; + for (var pos = txt.indexOf("\n"); pos > -1 && pos < start; pos = txt.indexOf("\n", pos + 1)) + ++newlines; + range.move("character", start - newlines); + for (; pos > -1 && pos < end; pos = txt.indexOf("\n", pos + 1)) + ++newlines; + endrange.move("character", end - newlines); + range.setEndPoint("EndToEnd", endrange); + range.select(); + }; + } + + CodeMirror.defineMode("null", function() { + return {token: function(stream) {stream.skipToEnd();}}; + }); + CodeMirror.defineMIME("text/plain", "null"); + + return CodeMirror; +})(); Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/lib/overlay.js =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/lib/overlay.js (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/lib/overlay.js 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,51 @@ +// Utility function that allows modes to be combined. The mode given +// as the base argument takes care of most of the normal mode +// functionality, but a second (typically simple) mode is used, which +// can override the style of text. Both modes get to parse all of the +// text, but when both assign a non-null style to a piece of code, the +// overlay wins, unless the combine argument was true, in which case +// the styles are combined. + +CodeMirror.overlayParser = function(base, overlay, combine) { + return { + startState: function() { + return { + base: CodeMirror.startState(base), + overlay: CodeMirror.startState(overlay), + basePos: 0, baseCur: null, + overlayPos: 0, overlayCur: null + }; + }, + copyState: function(state) { + return { + base: CodeMirror.copyState(base, state.base), + overlay: CodeMirror.copyState(overlay, state.overlay), + basePos: state.basePos, baseCur: null, + overlayPos: state.overlayPos, overlayCur: null + }; + }, + + token: function(stream, state) { + if (stream.start == state.basePos) { + state.baseCur = base.token(stream, state.base); + state.basePos = stream.pos; + } + if (stream.start == state.overlayPos) { + stream.pos = stream.start; + state.overlayCur = overlay.token(stream, state.overlay); + state.overlayPos = stream.pos; + } + stream.pos = Math.min(state.basePos, state.overlayPos); + if (stream.eol()) state.basePos = state.overlayPos = 0; + + if (state.overlayCur == null) return state.baseCur; + if (state.baseCur != null && combine) return state.baseCur + " " + state.overlayCur; + else return state.overlayCur; + }, + + indent: function(state, textAfter) { + return base.indent(state.base, textAfter); + }, + electricChars: base.electricChars + }; +}; Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/lib/runmode.js =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/lib/runmode.js (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/lib/runmode.js 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,27 @@ +CodeMirror.runMode = function(string, modespec, callback) { + var mode = CodeMirror.getMode({indentUnit: 2}, modespec); + var isNode = callback.nodeType == 1; + if (isNode) { + var node = callback, accum = []; + callback = function(string, style) { + if (string == "\n") + accum.push("<br>"); + else if (style) + accum.push("<span class=\"cm-" + CodeMirror.htmlEscape(style) + "\">" + CodeMirror.htmlEscape(string) + "</span>"); + else + accum.push(CodeMirror.htmlEscape(string)); + } + } + var lines = CodeMirror.splitLines(string), state = CodeMirror.startState(mode); + for (var i = 0, e = lines.length; i < e; ++i) { + if (i) callback("\n"); + var stream = new CodeMirror.StringStream(lines[i]); + while (!stream.eol()) { + var style = mode.token(stream, state); + callback(stream.current(), style); + stream.start = stream.pos; + } + } + if (isNode) + node.innerHTML = accum.join(""); +}; Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/manual.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/manual.html (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/manual.html 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,822 @@ +<!doctype html> +<html> + <head> + <title>CodeMirror: User Manual</title> + <link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Droid+Sans|Droid+Sans:bold"/> + <link rel="stylesheet" type="text/css" href="css/docs.css"/> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> + <style>dl dl {margin: 0;}</style> + </head> + <body> + +<h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMirror</a></h1> + +<pre class="grey"> +<img src="css/baboon.png" class="logo" alt="logo"/>/* User manual and + reference guide */ +</pre> + +<div class="clear"><div class="leftbig blk"> + + <h2 id="overview">Overview</h2> + + <p>CodeMirror is a code-editor component that can be embedded in + Web pages. It provides <em>only</em> the editor component, no + accompanying buttons + (see <a href="http://www.octolabs.com/javascripts/codemirror-ui/">CodeMirror + UI</a> for a drop-in button bar), auto-completion, or other IDE + functionality. It does provide a rich API on top of which such + functionality can be straightforwardly implemented.</p> + + <p>CodeMirror works with language-specific modes. Modes are + JavaScript programs that help color (and optionally indent) text + written in a given language. The distribution comes with a few + modes (see the <code>mode/</code> directory), and it isn't hard + to <a href="#modeapi">write new ones</a> for other languages.</p> + + <h2 id="usage">Basic Usage</h2> + + <p>The easiest way to use CodeMirror is to simply load the script + and style sheet found under <code>lib/</code> in the distribution, + plus a mode script from one of the <code>mode/</code> directories + and a theme stylesheet from <code>theme/</code>. (See + also <a href="compress.html">the compresion helper</a>.) For + example:</p> + + <pre><script src="lib/codemirror.js"></script> +<link rel="stylesheet" href="lib/codemirror.css"> +<script src="mode/javascript/javascript.js"></script> +<link rel="stylesheet" href="theme/default.css"></pre> + + <p>(If you use a them other than <code>default.css</code>, you + also have to specify the + <a href="#option_theme"><code>theme</code></a> option.) Having + done this, an editor instance can be created like this:</p> + + <pre>var myCodeMirror = CodeMirror(document.body);</pre> + + <p>The editor will be appended to the document body, will start + empty, and will use the mode that we loaded. To have more control + over the new editor, a configuration object can be passed + to <code>CodeMirror</code> as a second argument:</p> + + <pre>var myCodeMirror = CodeMirror(document.body, { + value: "function myScript(){return 100;}\n", + mode: "javascript" +});</pre> + + <p>This will initialize the editor with a piece of code already in + it, and explicitly tell it to use the JavaScript mode (which is + useful when multiple modes are loaded). + See <a href="#config">below</a> for a full discussion of the + configuration options that CodeMirror accepts.</p> + + <p>In cases where you don't want to append the editor to an + element, and need more control over the way it is inserted, the + first argument to the <code>CodeMirror</code> function can also + be a function that, when given a DOM element, inserts it into the + document somewhere. This could be used to, for example, replace a + textarea with a real editor:</p> + + <pre>var myCodeMirror = CodeMirror(function(elt) { + myTextArea.parentNode.replaceChild(elt, myTextArea); +}, {value: myTextArea.value});</pre> + + <p>However, for this use case, which is a common way to use + CodeMirror, the library provides a much more powerful + shortcut:</p> + + <pre>var myCodeMirror = CodeMirror.fromTextArea(myTextArea);</pre> + + <p>This will, among other things, ensure that the textarea's value + is updated when the form (if it is part of a form) is submitted. + See the <a href="#fromTextArea">API reference</a> for a full + description of this method.</p> + + <h2 id="config">Configuration</h2> + + <p>Both the <code>CodeMirror</code> function and + its <code>fromTextArea</code> method take as second (optional) + argument an object containing configuration options. Any option + not supplied like this will be taken + from <code>CodeMirror.defaults</code>, an object containing the + default options. You can update this object to change the defaults + on your page.</p> + + <p>Options are not checked in any way, so setting bogus option + values is bound to lead to odd errors.</p> + + <p><em>Note:</em> CodeMirror + 2 <a href="internals.html#summary">does not support</a> + line-wrapping. I would have very much liked to support it, but it + combines extremely poorly with the way the editor is + implemented.</p> + + <p>These are the supported options:</p> + + <dl> + <dt id="option_value"><code>value (string)</code></dt> + <dd>The starting value of the editor.</dd> + + <dt id="option_mode"><code>mode (string or object)</code></dt> + <dd>The mode to use. When not given, this will default to the + first mode that was loaded. It may be a string, which either + simply names the mode or is + a <a href="http://en.wikipedia.org/wiki/MIME">MIME</a> type + associated with the mode. Alternatively, it may be an object + containing configuration options for the mode, with + a <code>name</code> property that names the mode (for + example <code>{name: "javascript", json: true}</code>). The demo + pages for each mode contain information about what configuration + parameters the mode supports. You can ask CodeMirror which modes + and MIME types are loaded with + the <code>CodeMirror.listModes</code> + and <code>CodeMirror.listMIMEs</code> functions.</dd> + + <dt id="option_theme"><code>theme (string)</code></dt> + <dd>The theme to style the editor with. You must make sure the + CSS file defining the corresponding <code>.cm-s-[name]</code> + styles is loaded (see + the <a href="theme/"><code>theme</code></a> directory in the + distribution).</dd> + + <dt id="option_indentUnit"><code>indentUnit (integer)</code></dt> + <dd>How many spaces a block (whatever that means in the edited + language) should be indented. The default is 2.</dd> + + <dt id="option_indentWithTabs"><code>indentWithTabs (boolean)</code></dt> + <dd>Whether, when indenting, the first N*8 spaces should be + replaced by N tabs. Default is false.</dd> + + <dt id="option_tabMode"><code>tabMode (string)</code></dt> + <dd>Determines what happens when the user presses the tab key. + Must be one of the following: + <dl> + <dt><code>"classic" (the default)</code></dt> + <dd>When nothing is selected, insert a tab. Otherwise, + behave like the <code>"shift"</code> mode. (When shift is + held, this behaves like the <code>"indent"</code> mode.)</dd> + <dt><code>"shift"</code></dt> + <dd>Indent all selected lines by + one <a href="#option_indentUnit"><code>indentUnit</code></a>. + If shift was held while pressing tab, un-indent all selected + lines one unit.</dd> + <dt><code>"indent"</code></dt> + <dd>Indent the line the 'correctly', based on its syntactic + context. Only works if the + mode <a href="#indent">supports</a> it.</dd> + <dt><code>"default"</code></dt> + <dd>Do not capture tab presses, let the browser apply its + default behaviour (which usually means it skips to the next + control).</dd> + </dl></dd> + + <dt id="option_enterMode"><code>enterMode (string)</code></dt> + <dd>Determines whether and how new lines are indented when the + enter key is pressed. The following modes are supported: + <dl> + <dt><code>"indent" (the default)</code></dt> + <dd>Use the mode's indentation rules to give the new line + the correct indentation.</dd> + <dt><code>"keep"</code></dt> + <dd>Indent the line the same as the previous line.</dd> + <dt><code>"flat"</code></dt> + <dd>Do not indent the new line.</dd> + </dl></dd> + + <dt id="option_electricChars"><code>electricChars (boolean)</code></dt> + <dd>Configures whether the editor should re-indent the current + line when a character is typed that might change its proper + indentation (only works if the mode supports indentation). + Default is true.</dd> + + <dt id="option_lineNumbers"><code>lineNumbers (boolean)</code></dt> + <dd>Whether to show line numbers to the left of the editor.</dd> + + <dt id="option_firstLineNumber"><code>firstLineNumber (integer)</code></dt> + <dd>At which number to start counting lines. Default is 1.</dd> + + <dt id="option_gutter"><code>gutter (boolean)</code></dt> + <dd>Can be used to force a 'gutter' (empty space on the left of + the editor) to be shown even when no line numbers are active. + This is useful for setting <a href="#setMarker">markers</a>.</dd> + + <dt id="option_readOnly"><code>readOnly (boolean)</code></dt> + <dd>This disables editing of the editor content by the user. + (Changes through API functions will still be possible.) If you + also want to disable the cursor, use <code>"nocursor"</code> as + a value for this option, instead of <code>true</code>.</dd> + + <dt id="option_onChange"><code>onChange (function)</code></dt> + <dd>When given, this function will be called every time the + content of the editor is changed. It will be given the editor + instance as only argument.</dd> + + <dt id="option_onCursorActivity"><code>onCursorActivity (function)</code></dt> + <dd>Like <code>onChange</code>, but will also be called when the + cursor moves without any changes being made.</dd> + + <dt id="option_onGutterClick"><code>onGutterClick (function)</code></dt> + <dd>When given, will be called whenever the editor gutter (the + line-number area) is clicked. Will be given the editor instance + as first argument, and the (zero-based) number of the line that + was clicked as second argument.</dd> + + <dt id="option_onFocus"><code>onFocus, onBlur (function)</code></dt> + <dd>The given functions will be called whenever the editor is + focused or unfocused.</dd> + + <dt id="option_onScroll"><code>onScroll (function)</code></dt> + <dd>When given, will be called whenever the editor is + scrolled.</dd> + + <dt id="option_onHighlightComplete"><code>onHighlightComplete (function)</code></dt> + <dd>Whenever the editor's content has been fully highlighted, + this function (if given) will be called. It'll be given a single + argument, the editor instance.</dd> + + <dt id="option_matchBrackets"><code>matchBrackets (boolean)</code></dt> + <dd>Determines whether brackets are matched whenever the cursor + is moved next to a bracket.</dd> + + <dt id="option_workTime"><code>workTime, workDelay (number)</code></dt> + <dd>Highlighting is done by a pseudo background-thread that will + work for <code>workTime</code> milliseconds, and then use + timeout to sleep for <code>workDelay</code> milliseconds. The + defaults are 200 and 300, you can change these options to make + the highlighting more or less aggressive.</dd> + + <dt id="option_undoDepth"><code>undoDepth (integer)</code></dt> + <dd>The maximum number of undo levels that the editor stores. + Defaults to 40.</dd> + + <dt id="option_tabindex"><code>tabindex (integer)</code></dt> + <dd>The <a href="http://www.w3.org/TR/html401/interact/forms.html#adef-tabindex">tab + index</a> to assign to the editor. If not given, no tab index + will be assigned.</dd> + + <dt id="option_document"><code>document (DOM document)</code></dt> + <dd>Use this if you want to display the editor in another DOM. + By default it will use the global <code>document</code> + object.</dd> + + <dt id="option_onKeyEvent"><code>onKeyEvent (function)</code></dt> + <dd>This provides a rather low-level hook into CodeMirror's key + handling. If provided, this function will be called on + every <code>keydown</code>, <code>keyup</code>, + and <code>keypress</code> event that CodeMirror captures. It + will be passed two arguments, the editor instance and the key + event. This key event is pretty much the raw key event, except + that a <code>stop()</code> method is always added to it. You + could feed it to, for example, <code>jQuery.Event</code> to + further normalize it.<br>This function can inspect the key + event, and handle it if it wants to. It may return true to tell + CodeMirror to ignore the event. Be wary that, on some browsers, + stopping a <code>keydown</code> does not stop + the <code>keypress</code> from firing, whereas on others it + does. If you respond to an event, you should probably inspect + its <code>type</code> property and only do something when it + is <code>keydown</code> (or <code>keypress</code> for actions + that need character data).</dd> + </dl> + + <h2 id="styling">Customized Styling</h2> + + <p>Up to a certain extent, CodeMirror's look can be changed by + modifying style sheet files. The style sheets supplied by modes + simply provide the colors for that mode, and can be adapted in a + very straightforward way. To style the editor itself, it is + possible to alter or override the styles defined + in <a href="lib/codemirror.css"><code>codemirror.css</code></a>.</p> + + <p>Some care must be taken there, since a lot of the rules in this + file are necessary to have CodeMirror function properly. Adjusting + colors should be safe, of course, and with some care a lot of + other things can be changed as well. The CSS classes defined in + this file serve the following roles:</p> + + <dl> + <dt id="class_CodeMirror"><code>CodeMirror</code></dt> + <dd>The outer element of the editor. This should be used for + borders and positioning. Can also be used to set styles that + should hold for everything inside the editor, or to set a + background.</dd> + + <dt id="class_CodeMirror_scroll"><code>CodeMirror-scroll</code></dt> + <dd>This determines whether the editor scrolls (<code>overflow: + auto</code> + fixed height). By default, it does. Giving + this <code>height: auto; overflow: visible;</code> will cause + the editor to resize to fit its content.</dd> + + <dt id="class_CodeMirror_focused"><code>CodeMirror-focused</code></dt> + <dd>Whenever the editor is focused, the top element gets this + class. This is used to hide the cursor and give the selection a + different color when the editor is not focused.</dd> + + <dt id="class_CodeMirror_gutter"><code>CodeMirror-gutter</code></dt> + <dd>Use this for giving a background or a border to the editor + gutter. Don't set any padding here, + use <code>CodeMirror-gutter-text</code> for that. By default, + the gutter is 'fluid', meaning it will adjust its width to the + maximum line number or line marker width. You can also set a + fixed width if you want.</dd> + + <dt id="class_CodeMirror_gutter_text"><code>CodeMirror-gutter-text</code></dt> + <dd>Used to style the actual line numbers. For the numbers to + line up, you'll want this style to use exactly the same font and + vertical padding as normal edited text, as per + the <code>CodeMirror-lines</code> class.</dd> + + <dt id="class_CodeMirror_lines"><code>CodeMirror-lines</code></dt> + <dd>The visible lines. If this has vertical + padding, <code>CodeMirror-gutter</code> should have the same + padding.</dd> + + <dt id="class_CodeMirror_cursor"><code>CodeMirror-cursor</code></dt> + <dd>The cursor is a block element that is absolutely positioned. + You can make it look whichever way you want.</dd> + + <dt id="class_CodeMirror_selected"><code>CodeMirror-selected</code></dt> + <dd>The selection is represented by <code>span</code> elements + with this class.</dd> + + <dt id="class_CodeMirror_matchingbracket"><code>CodeMirror-matchingbracket</code>, + <code>CodeMirror-nonmatchingbracket</code></dt> + <dd>These are used to style matched (or unmatched) brackets.</dd> + </dl> + + <p>The actual lines, as well as the cursor, are represented + by <code>pre</code> elements. By default no text styling (such as + bold) that might change line height is applied. If you do want + such effects, you'll have to give <code>CodeMirror pre</code> a + fixed height. Also, you must still take care that character width + is constant.</p> + + <p>If your page's style sheets do funky things to + all <code>div</code> or <code>pre</code> elements (you probably + shouldn't do that), you'll have to define rules to cancel these + effects out again for elements under the <code>CodeMirror</code> + class.</p> + + <h2 id="api">Programming API</h2> + + <p>A lot of CodeMirror features are only available through its API. + This has the disadvantage that you need to do work to enable them, + and the advantage that CodeMirror will fit seamlessly into your + application.</p> + + <p>Whenever points in the document are represented, the API uses + objects with <code>line</code> and <code>ch</code> properties. + Both are zero-based. CodeMirror makes sure to 'clip' any positions + passed by client code so that they fit inside the document, so you + shouldn't worry too much about sanitizing your coordinates. If you + give <code>ch</code> a value of <code>null</code>, or don't + specify it, it will be replaced with the length of the specified + line.</p> + + <dl> + <dt id="getValue"><code>getValue() → string</code></dt> + <dd>Get the current editor content.</dd> + <dt id="setValue"><code>setValue(string)</code></dt> + <dd>Set the editor content.</dd> + + <dt id="getSelection"><code>getSelection() → string</code></dt> + <dd>Get the currently selected code.</dd> + <dt id="replaceSelection"><code>replaceSelection(string)</code></dt> + <dd>Replace the selection with the given string.</dd> + + <dt id="focus"><code>focus()</code></dt> + <dd>Give the editor focus.</dd> + + <dt id="setOption"><code>setOption(option, value)</code></dt> + <dd>Change the configuration of the editor. <code>option</code> + should the name of an <a href="#config">option</a>, + and <code>value</code> should be a valid value for that + option.</dd> + <dt id="getOption"><code>getOption(option) → value</code></dt> + <dd>Retrieves the current value of the given option for this + editor instance.</dd> + + <dt id="cursorCoords"><code>cursorCoords(start) → object</code></dt> + <dd>Returns an <code>{x, y, yBot}</code> object containing the + coordinates of the cursor relative to the top-left corner of the + page. <code>yBot</code> is the coordinate of the bottom of the + cursor. <code>start</code> is a boolean indicating whether you + want the start or the end of the selection.</dd> + <dt id="charCoords"><code>charCoords(pos) → object</code></dt> + <dd>Like <code>cursorCoords</code>, but returns the position of + an arbitrary characters. <code>pos</code> should be + a <code>{line, ch}</code> object.</dd> + <dt id="coordsChar"><code>coordsChar(object) → pos</code></dt> + <dd>Given an <code>{x, y}</code> object (in page coordinates), + returns the <code>{line, ch}</code> position that corresponds to + it.</dd> + + <dt id="undo"><code>undo()</code></dt> + <dd>Undo one edit (if any undo events are stored).</dd> + <dt id="redo"><code>redo()</code></dt> + <dd>Redo one undone edit.</dd> + <dt id="historySize"><code>historySize() → object</code></dt> + <dd>Returns an object with <code>{undo, redo}</code> properties, + both of which hold integers, indicating the amount of stored + undo and redo operations.</dd> + + <dt id="indentLine"><code>indentLine(line)</code></dt> + <dd>Reset the given line's indentation to the indentation + prescribed by the mode.</dd> + + <dt id="getSearchCursor"><code>getSearchCursor(query, start, caseFold) → cursor</code></dt> + <dd>Used to implement search/replace + functionality. <code>query</code> can be a regular expression or + a string (only strings will match across lines—if they contain + newlines). <code>start</code> provides the starting position of + the search. It can be a <code>{line, ch}</code> object, or can + be left off to default to the start of the + document. <code>caseFold</code> is only relevant when matching a + string. It will cause the search to be case-insensitive. A + search cursor has the following methods: + <dl> + <dt><code>findNext(), findPrevious() → boolean</code></dt> + <dd>Search forward or backward from the current position. + The return value indicates whether a match was found. If + matching a regular expression, the return value will be the + array returned by the <code>match</code> method, in case you + want to extract matched groups.</dd> + <dt><code>from(), to() → object</code></dt> + <dd>These are only valid when the last call + to <code>findNext</code> or <code>findPrevious</code> did + not return false. They will return <code>{line, ch}</code> + objects pointing at the start and end of the match.</dd> + </dl></dd> + + <dt id="getTokenAt"><code>getTokenAt(pos) → object</code></dt> + <dd>Retrieves information about the token the current mode found + at the given position (a <code>{line, ch}</code> object). The + returned object has the following properties: + <dl> + <dt><code>start</code></dt><dd>The character (on the given line) at which the token starts.</dd> + <dt><code>end</code></dt><dd>The character at which the token ends.</dd> + <dt><code>string</code></dt><dd>The token's string.</dd> + <dt><code>className</code></dt><dd>The class the mode assigned + to the token. (Can be null when no class was assigned.)</dd> + </dl></dd> + + <dt id="markText"><code>markText(from, to, className) → function</code></dt> + <dd>Can be used to mark a range of text with a specific CSS + class name. <code>from</code> and <code>to</code> should + be <code>{line, ch}</code> objects. The method will return a + function that can be called to remove the marking.</dd> + + <dt id="setMarker"><code>setMarker(line, text, className) → lineHandle</code></dt> + <dd>Add a gutter marker for the given line. Gutter markers are + shown in the line-number area (instead of the number for this + line). Both <code>text</code> and <code>className</code> are + optional. Setting <code>text</code> to a Unicode character like + ● tends to give a nice effect. To put a picture in the gutter, + set <code>text</code> to a space and <code>className</code> to + something that sets a background image. If you + specify <code>text</code>, the given text (which may contain + HTML) will, by default, replace the line number for that line. + If this is not what you want, you can include the + string <code>%N%</code> in the text, which will be replaced by + the line number.</dd> + <dt id="clearMarker"><code>clearMarker(line)</code></dt> + <dd>Clears a marker created + with <code>setMarker</code>. <code>line</code> can be either a + number or a handle returned by <code>setMarker</code> (since a + number may now refer to a different line if something was added + or deleted).</dd> + <dt id="setLineClass"><code>setLineClass(line, className) → lineHandle</code></dt> + <dd>Set a CSS class name for the given line. <code>line</code> + can be a number or a line handle (as returned + by <code>setMarker</code> or this function). + Pass <code>null</code> to clear the class for a line.</dd> + + <dt id="lineInfo"><code>lineInfo(line) → object</code></dt> + <dd>Returns the line number, text content, and marker status of + the given line, which can be either a number or a handle + returned by <code>setMarker</code>. The returned object has the + structure <code>{line, text, markerText, markerClass}</code>.</dd> + + <dt id="addWidget"><code>addWidget(pos, node, scrollIntoView)</code></dt> + <dd>Puts <code>node</code>, which should be an absolutely + positioned DOM node, into the editor, positioned right below the + given <code>{line, ch}</code> position. + When <code>scrollIntoView</code> is true, the editor will ensure + that the entire node is visible (if possible). To remove the + widget again, simply use DOM methods (move it somewhere else, or + call <code>removeChild</code> on its parent).</dd> + + <dt id="matchBrackets"><code>matchBrackets()</code></dt> + <dd>Force matching-bracket-highlighting to happen.</dd> + + <dt id="lineCount"><code>lineCount() → number</code></dt> + <dd>Get the number of lines in the editor.</dd> + + <dt id="getCursor"><code>getCursor(start) → object</code></dt> + <dd><code>start</code> is a boolean indicating whether the start + or the end of the selection must be retrieved. If it is not + given, the current cursor pos, i.e. the side of the selection + that would move if you pressed an arrow key, is chosen. + A <code>{line, ch}</code> object will be returned.</dd> + <dt id="somethingSelected"><code>somethingSelected() → boolean</code></dt> + <dd>Return true if any text is selected.</dd> + <dt id="setCursor"><code>setCursor(pos)</code></dt> + <dd>Set the cursor position. You can either pass a + single <code>{line, ch}</code> object, or the line and the + character as two separate parameters.</dd> + <dt id="setSelection"><code>setSelection(start, end)</code></dt> + <dd>Set the selection range. <code>start</code> + and <code>end</code> should be <code>{line, ch}</code> objects.</dd> + + <dt id="getLine"><code>getLine(n) → string</code></dt> + <dd>Get the content of line <code>n</code>.</dd> + <dt id="setLine"><code>setLine(n, text)</code></dt> + <dd>Set the content of line <code>n</code>.</dd> + <dt id="removeLine"><code>removeLine(n)</code></dt> + <dd>Remove the given line from the document.</dd> + + <dt id="getRange"><code>getRange(from, to) → string</code></td> + <dd>Get the text between the given points in the editor, which + should be <code>{line, ch}</code> objects.</dd> + <dt id="replaceRange"><code>replaceRange(string, from, to)</code></dt> + <dd>Replace the part of the document between <code>from</code> + and <code>to</code> with the given string. <code>from</code> + and <code>to</code> must be <code>{line, ch}</code> + objects. <code>to</code> can be left off to simply insert the + string at position <code>from</code>.</dd> + </dl> + + <p>The following are more low-level methods:</p> + + <dl> + <dt id="operation"><code>operation(func) → result</code></dt> + <dd>CodeMirror internally buffers changes and only updates its + DOM structure after it has finished performing some operation. + If you need to perform a lot of operations on a CodeMirror + instance, you can call this method with a function argument. It + will call the function, buffering up all changes, and only doing + the expensive update after the function returns. This can be a + lot faster. The return value from this method will be the return + value of your function.</dd> + + <dt id="refresh"><code>refresh()</code></dt> + <dd>If your code does something to change the size of the editor + element (window resizes are already listened for), or unhides + it, you should probably follow up by calling this method to + ensure CodeMirror is still looking as intended.</dd> + + <dt id="getInputField"><code>getInputField() → textarea</code></dt> + <dd>Returns the hiden textarea used to read input.</dd> + <dt id="getWrapperElement"><code>getWrapperElement() → node</code></dt> + <dd>Returns the DOM node that represents the editor. Remove this + from your tree to delete an editor instance.</dd> + </dl> + + <p id="fromTextArea">Finally, the <code>CodeMirror</code> object + itself has a method <code>fromTextArea</code>. This takes a + textarea DOM node as first argument and an optional configuration + object as second. It will replace the textarea with a CodeMirror + instance, and wire up the form of that textarea (if any) to make + sure the editor contents are put into the textarea when the form + is submitted. A CodeMirror instance created this way has two + additional methods:</p> + + <dl> + <dt id="save"><code>save()</code></dt> + <dd>Copy the content of the editor into the textarea.</dd> + + <dt id="toTextArea"><code>toTextArea()</code></dt> + <dd>Remove the editor, and restore the original textarea (with + the editor's current content).</dd> + </dl> + + <p id="defineExtension">If you want define extra methods in terms + of the CodeMirror API, is it possible to + use <code>CodeMirror.defineExtension(name, value)</code>. This + will cause the given value (usually a method) to be added to all + CodeMirror instances created from then on.</p> + + <h2 id="modeapi">Writing CodeMirror Modes</h2> + + <p>Modes typically consist of a JavaScript file and a CSS file. + The CSS file (see, for + example <a href="mode/javascript/javascript.css"><code>javascript.css</code></a>) + defines the classes that will be used to style the syntactic + elements of the code, and the script contains the logic to + actually assign these classes to the right pieces of text.</p> + + <p>You'll usually want to use some kind of prefix for your CSS + classes, so that they are unlikely to clash with other classes, + both those used by other modes and those defined by the page in + which CodeMirror is embedded.</p> + + <p id="defineMode">The mode script should + call <code>CodeMirror.defineMode</code> to register itself with + CodeMirror. This function takes two arguments. The first should be + the name of the mode, for which you should use a lowercase string, + preferably one that is also the name of the files that define the + mode (i.e. <code>"xml"</code> is defined <code>xml.js</code>). The + second argument should be a function that, given a CodeMirror + configuration object (the thing passed to + the <code>CodeMirror</code> function) and a mode configuration + object (as in the <a href="#option_mode"><code>mode</code></a> + option), returns a mode object.</p> + + <p>Typically, you should use this second argument + to <code>defineMode</code> as your module scope function (modes + should not leak anything into the global scope!), i.e. write your + whole mode inside this function.</p> + + <p>The main responsibility of a mode script is <em>parsing</em> + the content of the editor. Depending on the language and the + amount of functionality desired, this can be done in really easy + or extremely complicated ways. Some parsers can be stateless, + meaning that they look at one element (<em>token</em>) of the code + at a time, with no memory of what came before. Most, however, will + need to remember something. This is done by using a <em>state + object</em>, which is an object that can be mutated every time a + new token is read.</p> + + <p id="startState">Modes that use a state must define + a <code>startState</code> method on their mode object. This is a + function of no arguments that produces a state object to be used + at the start of a document.</p> + + <p id="token">The most important part of a mode object is + its <code>token(stream, state)</code> method. All modes must + define this method. It should read one token from the stream it is + given as an argument, optionally update its state, and return a + style string, or <code>null</code> for tokens that do not have to + be styled. For your styles, you can either use the 'standard' ones + defined in the themes (without the <code>cm-</code> prefix), or + define your own (as the <a href="../mode/diff/index.html">diff</a> + mode does) and have people include a custom theme for your + mode.<p> + + <p id="blankLine">By default, blank lines are simply skipped when + tokenizing a document. For languages that have significant blank + lines, you can define a <code>blankLine(state)</code> method on + your mode that will get called whenever a blank line is passed + over, so that it can update the parser state.</p> + + <p id="StringStream">The stream object encapsulates a line of code + (tokens may never span lines) and our current position in that + line. It has the following API:</p> + + <dl> + <dt><code>eol() → boolean</code></dt> + <dd>Returns true only if the stream is at the end of the + line.</dd> + <dt><code>sol() → boolean</code></dt> + <dd>Returns true only if the stream is at the start of the + line.</dd> + + <dt><code>peek() → character</code></dt> + <dd>Returns the next character in the stream without advancing + it. Will return <code>undefined</code> at the end of the + line.</dd> + <dt><code>next() → character</code></dt> + <dd>Returns the next character in the stream and advances it. + Also returns <code>undefined</code> when no more characters are + available.</dd> + + <dt><code>eat(match) → character</code></dt> + <dd><code>match</code> can be a character, a regular expression, + or a function that takes a character and returns a boolean. If + the next character in the stream 'matches' the given argument, + it is consumed and returned. Otherwise, <code>undefined</code> + is returned.</dd> + <dt><code>eatWhile(match) → boolean</code></dt> + <dd>Repeatedly calls <code>eat</code> with the given argument, + until it fails. Returns true if any characters were eaten.</dd> + <dt><code>eatSpace() → boolean</code></dt> + <dd>Shortcut for <code>eatWhile</code> when matching + white-space.</dd> + <dt><code>skipToEnd()</code></dt> + <dd>Moves the position to the end of the line.</dd> + <dt><code>skipTo(ch) → boolean</code></dt> + <dd>Skips to the next occurrence of the given character, if + found. Returns true if the character was found.</dd> + <dt><code>match(pattern, consume, caseFold) → boolean</code></dt> + <dd>Act like a + multi-character <code>eat</code>—if <code>consume</code> is true + or not given—or a look-ahead that doesn't update the stream + position—if it is false. <code>pattern</code> can be either a + string or a regular expression starting with <code>^</code>. + When it is a string, <code>caseFold</code> can be set to true to + make the match case-insensitive. When successfully matching a + regular expression, the returned value will be the array + returned by <code>match</code>, in case you need to extract + matched groups.</dd> + + <dt><code>backUp(n)</code></dt> + <dd>Backs up the stream <code>n</code> characters. Backing it up + further than the start of the current token will cause things to + break, so be careful.</dd> + <dt><code>column() → integer</code></dt> + <dd>Returns the column (taking into account tabs) at which the + current token starts. Can be used to find out whether a token + starts a new line.</dd> + <dt><code>indentation() → integer</code></dt> + <dd>Tells you how far the current line has been indented, in + spaces. Corrects for tab characters.</dd> + + <dt><code>current() → string</code></dt> + <dd>Get the string between the start of the current token and + the current stream position.</dd> + </dl> + + <p id="copyState">Because state object are mutated, and CodeMirror + needs to keep valid versions of a state around so that it can + restart a parse at any line, copies must be made of state objects. + The default algorithm used is that a new state object is created, + which gets all the properties of the old object. Any properties + which hold arrays get a copy of these arrays (since arrays tend to + be used as mutable stacks). When this is not correct, for example + because a mode mutates non-array properties of its state object, a + mode object should define a <code>copyState</code> method, + which is given a state and should return a safe copy of that + state.</p> + + <p id="indent">If you want your mode to provide smart indentation + (see <a href="#option_enterMode"><code>entermode</code></a> + and <a href="#option_tabMode"><code>tabMode</code></a> when they + have a value of <code>"indent"</code>), you must define + an <code>indent(state, textAfter)</code> method on your mode + object.</p> + + <p>The indentation method should inspect the given state object, + and optionally the <code>textAfter</code> string, which contains + the text on the line that is being indented, and return an + integer, the amount of spaces to indent. It should usually take + the <a href="#option_indentUnit"><code>indentUnit</code></a> + option into account.</p> + + <p id="electricChars">Finally, a mode may define + an <code>electricChars</code> property, which should hold a string + containing all the characters that should trigger the behaviour + described for + the <a href="#option_electricChars"><code>electricChars</code></a> + option.</p> + + <p>So, to summarize, a mode <em>must</em> provide + a <code>token</code> method, and it <em>may</em> + provide <code>startState</code>, <code>copyState</code>, + and <code>indent</code> methods. For an example of a trivial mode, + see the <a href="mode/diff/diff.js">diff mode</a>, for a more + involved example, see + the <a href="mode/javascript/javascript.js">JavaScript + mode</a>.</p> + + <p>Sometimes, it is useful for modes to <em>nest</em>—to have one + mode delegate work to another mode. An example of this kind of + mode is the <a href="mode/htmlmixed/htmlmixed.js">mixed-mode HTML + mode</a>. To implement such nesting, it is usually necessary to + create mode objects and copy states yourself. To create a mode + object, there are <code>CodeMirror.getMode(options, + parserConfig)</code>, where the first argument is a configuration + object as passed to the mode constructor function, and the second + argument is a mode specification as in + the <a href="#option_mode"><code>mode</code></a> option. To copy a + state object, call <code>CodeMirror.copyState(mode, state)</code>, + where <code>mode</code> is the mode that created the given + state.</p> + + <p>To make indentation work properly in a nested parser, it is + advisable to give the <code>startState</code> method of modes that + are intended to be nested an optional argument that provides the + base indentation for the block of code. The JavaScript and CSS + parser do this, for example, to allow JavaScript and CSS code + inside the mixed-mode HTML mode to be properly indented.</p> + + <p>Finally, it is possible to associate your mode, or a certain + configuration of your mode, with + a <a href="http://en.wikipedia.org/wiki/MIME">MIME</a> type. For + example, the JavaScript mode associates itself + with <code>text/javascript</code>, and its JSON variant + with <code>application/json</code>. To do this, + call <code>CodeMirror.defineMIME(mime, modeSpec)</code>, + where <code>modeSpec</code> can be a string or object specifying a + mode, as in the <a href="#option_mode"><code>mode</code></a> + option.</p> + +</div><div class="rightsmall blk"> + + <h2>Contents</h2> + + <ul> + <li><a href="#overview">Overview</a></li> + <li><a href="#usage">Basic Usage</a></li> + <li><a href="#config">Configuration</a></li> + <li><a href="#styling">Customized Styling</a></li> + <li><a href="#api">Programming API</a></li> + <li><a href="#modeapi">Writing CodeMirror Modes</a></li> + </ul> + +</div></div> + +<div style="height: 2em"> </div> + + </body> +</html> Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/clike/clike.css =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/clike/clike.css (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/clike/clike.css 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,7 @@ +span.c-like-keyword {color: #90b;} +span.c-like-number {color: #291;} +span.c-like-comment {color: #a70;} +span.c-like-string {color: #a22;} +span.c-like-preprocessor {color: #049;} +span.c-like-var {color: #22b;} +span.c-like-annotation {color: #666;} Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/clike/clike.js =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/clike/clike.js (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/clike/clike.js 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,187 @@ +CodeMirror.defineMode("clike", function(config, parserConfig) { + var indentUnit = config.indentUnit, keywords = parserConfig.keywords, + cpp = parserConfig.useCPP, multiLineStrings = parserConfig.multiLineStrings, + $vars = parserConfig.$vars, atAnnotations = parserConfig.atAnnotations; + var isOperatorChar = /[+\-*&%=<>!?|]/; + + function chain(stream, state, f) { + state.tokenize = f; + return f(stream, state); + } + + var type; + function ret(tp, style) { + type = tp; + return style; + } + + function tokenBase(stream, state) { + var ch = stream.next(); + if (ch == '"' || ch == "'") + return chain(stream, state, tokenString(ch)); + else if (/[\[\]{},;\:\.]/.test(ch)) + return ret(ch); + else if (ch == "#" && cpp && state.startOfLine) { + stream.skipToEnd(); + return ret("directive", "meta"); + } + else if (/\d/.test(ch)) { + stream.eatWhile(/[\w\.]/) + return ret("number", "number"); + } + else if (ch == "/") { + if (stream.eat("*")) { + return chain(stream, state, tokenComment); + } + else if (stream.eat("/")) { + stream.skipToEnd(); + return ret("comment", "comment"); + } + else { + stream.eatWhile(isOperatorChar); + return ret("operator"); + } + } + else if (isOperatorChar.test(ch)) { + stream.eatWhile(isOperatorChar); + return ret("operator"); + } + else if (atAnnotations && ch == "@") { + stream.eatWhile(/[\w\$_]/); + return ret("annotation", "meta"); + } + else if ($vars && ch == "$") { + stream.eatWhile(/[\w\$_]/); + return ret("word", "variable"); + } + else { + stream.eatWhile(/[\w\$_]/); + if (keywords && keywords.propertyIsEnumerable(stream.current())) return ret("keyword", "keyword"); + return ret("word"); + } + } + + function tokenString(quote) { + return function(stream, state) { + var escaped = false, next, end = false; + while ((next = stream.next()) != null) { + if (next == quote && !escaped) {end = true; break;} + escaped = !escaped && next == "\\"; + } + if (end || !(escaped || multiLineStrings)) + state.tokenize = tokenBase; + return ret("string", "string"); + }; + } + + function tokenComment(stream, state) { + var maybeEnd = false, ch; + while (ch = stream.next()) { + if (ch == "/" && maybeEnd) { + state.tokenize = tokenBase; + break; + } + maybeEnd = (ch == "*"); + } + return ret("comment", "comment"); + } + + function Context(indented, column, type, align, prev) { + this.indented = indented; + this.column = column; + this.type = type; + this.align = align; + this.prev = prev; + } + + function pushContext(state, col, type) { + return state.context = new Context(state.indented, col, type, null, state.context); + } + function popContext(state) { + return state.context = state.context.prev; + } + + // Interface + + return { + startState: function(basecolumn) { + return { + tokenize: tokenBase, + context: new Context((basecolumn || 0) - indentUnit, 0, "top", false), + indented: 0, + startOfLine: true + }; + }, + + token: function(stream, state) { + var ctx = state.context; + if (stream.sol()) { + if (ctx.align == null) ctx.align = false; + state.indented = stream.indentation(); + state.startOfLine = true; + } + if (stream.eatSpace()) return null; + var style = state.tokenize(stream, state); + if (type == "comment") return style; + if (ctx.align == null) ctx.align = true; + + if ((type == ";" || type == ":") && ctx.type == "statement") popContext(state); + else if (type == "{") pushContext(state, stream.column(), "}"); + else if (type == "[") pushContext(state, stream.column(), "]"); + else if (type == "(") pushContext(state, stream.column(), ")"); + else if (type == "}") { + if (ctx.type == "statement") ctx = popContext(state); + if (ctx.type == "}") ctx = popContext(state); + if (ctx.type == "statement") ctx = popContext(state); + } + else if (type == ctx.type) popContext(state); + else if (ctx.type == "}" || ctx.type == "top") pushContext(state, stream.column(), "statement"); + state.startOfLine = false; + return style; + }, + + indent: function(state, textAfter) { + if (state.tokenize != tokenBase) return 0; + var firstChar = textAfter && textAfter.charAt(0), ctx = state.context, closing = firstChar == ctx.type; + if (ctx.type == "statement") return ctx.indented + (firstChar == "{" ? 0 : indentUnit); + else if (ctx.align) return ctx.column + (closing ? 0 : 1); + else return ctx.indented + (closing ? 0 : indentUnit); + }, + + electricChars: "{}" + }; +}); + +(function() { + function keywords(str) { + var obj = {}, words = str.split(" "); + for (var i = 0; i < words.length; ++i) obj[words[i]] = true; + return obj; + } + var cKeywords = "auto if break int case long char register continue return default short do sizeof " + + "double static else struct entry switch extern typedef float union for unsigned " + + "goto while enum void const signed volatile"; + + CodeMirror.defineMIME("text/x-csrc", { + name: "clike", + useCPP: true, + keywords: keywords(cKeywords) + }); + CodeMirror.defineMIME("text/x-c++src", { + name: "clike", + useCPP: true, + keywords: keywords(cKeywords + " asm dynamic_cast namespace reinterpret_cast try bool explicit new " + + "static_cast typeid catch false operator template typename class friend private " + + "this using const_cast inline public throw virtual delete mutable protected true " + + "wchar_t") + }); + CodeMirror.defineMIME("text/x-java", { + name: "clike", + atAnnotations: true, + keywords: keywords("abstract assert boolean break byte case catch char class const continue default " + + "do double else enum extends false final finally float for goto if implements import " + + "instanceof int interface long native new null package private protected public " + + "return short static strictfp super switch synchronized this throw throws transient " + + "true try void volatile while") + }); +}()); Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/clike/index.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/clike/index.html (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/clike/index.html 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,101 @@ +<!doctype html> +<html> + <head> + <title>CodeMirror 2: C-like mode</title> + <link rel="stylesheet" href="../../lib/codemirror.css"> + <script src="../../lib/codemirror.js"></script> + <script src="clike.js"></script> + <link rel="stylesheet" href="../../theme/default.css"> + <link rel="stylesheet" href="../../css/docs.css"> + <style>.CodeMirror {border: 2px inset #dee;}</style> + </head> + <body> + <h1>CodeMirror 2: C-like mode</h1> + +<form><textarea id="code" name="code"> +/* C demo code */ + +#include <zmq.h> +#include <pthread.h> +#include <semaphore.h> +#include <time.h> +#include <stdio.h> +#include <fcntl.h> +#include <malloc.h> + +typedef struct { + void* arg_socket; + zmq_msg_t* arg_msg; + char* arg_string; + unsigned long arg_len; + int arg_int, arg_command; + + int signal_fd; + int pad; + void* context; + sem_t sem; +} acl_zmq_context; + +#define p(X) (context->arg_##X) + +void* zmq_thread(void* context_pointer) { + acl_zmq_context* context = (acl_zmq_context*)context_pointer; + char ok = 'K', err = 'X'; + int res; + + while (1) { + while ((res = sem_wait(&context->sem)) == EINTR); + if (res) {write(context->signal_fd, &err, 1); goto cleanup;} + switch(p(command)) { + case 0: goto cleanup; + case 1: p(socket) = zmq_socket(context->context, p(int)); break; + case 2: p(int) = zmq_close(p(socket)); break; + case 3: p(int) = zmq_bind(p(socket), p(string)); break; + case 4: p(int) = zmq_connect(p(socket), p(string)); break; + case 5: p(int) = zmq_getsockopt(p(socket), p(int), (void*)p(string), &p(len)); break; + case 6: p(int) = zmq_setsockopt(p(socket), p(int), (void*)p(string), p(len)); break; + case 7: p(int) = zmq_send(p(socket), p(msg), p(int)); break; + case 8: p(int) = zmq_recv(p(socket), p(msg), p(int)); break; + case 9: p(int) = zmq_poll(p(socket), p(int), p(len)); break; + } + p(command) = errno; + write(context->signal_fd, &ok, 1); + } + cleanup: + close(context->signal_fd); + free(context_pointer); + return 0; +} + +void* zmq_thread_init(void* zmq_context, int signal_fd) { + acl_zmq_context* context = malloc(sizeof(acl_zmq_context)); + pthread_t thread; + + context->context = zmq_context; + context->signal_fd = signal_fd; + sem_init(&context->sem, 1, 0); + pthread_create(&thread, 0, &zmq_thread, context); + pthread_detach(thread); + return context; +} +</textarea></form> + + <script> + var editor = CodeMirror.fromTextArea(document.getElementById("code"), { + lineNumbers: true, + matchBrackets: true, + mode: "text/x-csrc" + }); + </script> + + <p>Simple mode that tries to handle C-like languages as well as it + can. Takes two configuration parameters: <code>keywords</code>, an + object whose property names are the keywords in the language, + and <code>useCPP</code>, which determines whether C preprocessor + directives are recognized.</p> + + <p><strong>MIME types defined:</strong> <code>text/x-csrc</code> + (C code), <code>text/x-c++src</code> (C++ + code), <code>text/x-java</code> (Java code).</p> + </body> +</html> Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/css/css.js =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/css/css.js (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/css/css.js 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,124 @@ +CodeMirror.defineMode("css", function(config) { + var indentUnit = config.indentUnit, type; + function ret(style, tp) {type = tp; return style;} + + function tokenBase(stream, state) { + var ch = stream.next(); + if (ch == "@") {stream.eatWhile(/\w/); return ret("meta", stream.current());} + else if (ch == "/" && stream.eat("*")) { + state.tokenize = tokenCComment; + return tokenCComment(stream, state); + } + else if (ch == "<" && stream.eat("!")) { + state.tokenize = tokenSGMLComment; + return tokenSGMLComment(stream, state); + } + else if (ch == "=") ret(null, "compare"); + else if ((ch == "~" || ch == "|") && stream.eat("=")) return ret(null, "compare"); + else if (ch == "\"" || ch == "'") { + state.tokenize = tokenString(ch); + return state.tokenize(stream, state); + } + else if (ch == "#") { + stream.eatWhile(/\w/); + return ret("atom", "hash"); + } + else if (ch == "!") { + stream.match(/^\s*\w*/); + return ret("keyword", "important"); + } + else if (/\d/.test(ch)) { + stream.eatWhile(/[\w.%]/); + return ret("number", "unit"); + } + else if (/[,.+>*\/]/.test(ch)) { + return ret(null, "select-op"); + } + else if (/[;{}:\[\]]/.test(ch)) { + return ret(null, ch); + } + else { + stream.eatWhile(/[\w\\\-_]/); + return ret("variable", "variable"); + } + } + + function tokenCComment(stream, state) { + var maybeEnd = false, ch; + while ((ch = stream.next()) != null) { + if (maybeEnd && ch == "/") { + state.tokenize = tokenBase; + break; + } + maybeEnd = (ch == "*"); + } + return ret("comment", "comment"); + } + + function tokenSGMLComment(stream, state) { + var dashes = 0, ch; + while ((ch = stream.next()) != null) { + if (dashes >= 2 && ch == ">") { + state.tokenize = tokenBase; + break; + } + dashes = (ch == "-") ? dashes + 1 : 0; + } + return ret("comment", "comment"); + } + + function tokenString(quote) { + return function(stream, state) { + var escaped = false, ch; + while ((ch = stream.next()) != null) { + if (ch == quote && !escaped) + break; + escaped = !escaped && ch == "\\"; + } + if (!escaped) state.tokenize = tokenBase; + return ret("string", "string"); + }; + } + + return { + startState: function(base) { + return {tokenize: tokenBase, + baseIndent: base || 0, + stack: []}; + }, + + token: function(stream, state) { + if (stream.eatSpace()) return null; + var style = state.tokenize(stream, state); + + var context = state.stack[state.stack.length-1]; + if (type == "hash" && context == "rule") style = "atom"; + else if (style == "variable") { + if (context == "rule") style = "number"; + else if (!context || context == "@media{") style = "tag"; + } + + if (context == "rule" && /^[\{\};]$/.test(type)) + state.stack.pop(); + if (type == "{") { + if (context == "@media") state.stack[state.stack.length-1] = "@media{"; + else state.stack.push("{"); + } + else if (type == "}") state.stack.pop(); + else if (type == "@media") state.stack.push("@media"); + else if (context == "{" && type != "comment") state.stack.push("rule"); + return style; + }, + + indent: function(state, textAfter) { + var n = state.stack.length; + if (/^\}/.test(textAfter)) + n -= state.stack[state.stack.length-1] == "rule" ? 2 : 1; + return state.baseIndent + n * indentUnit; + }, + + electricChars: "}" + }; +}); + +CodeMirror.defineMIME("text/css", "css"); Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/css/index.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/css/index.html (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/css/index.html 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,56 @@ +<!doctype html> +<html> + <head> + <title>CodeMirror 2: CSS mode</title> + <link rel="stylesheet" href="../../lib/codemirror.css"> + <script src="../../lib/codemirror.js"></script> + <script src="css.js"></script> + <link rel="stylesheet" href="../../theme/default.css"> + <style>.CodeMirror {background: #f8f8f8;}</style> + <link rel="stylesheet" href="../../css/docs.css"> + </head> + <body> + <h1>CodeMirror 2: CSS mode</h1> + <form><textarea id="code" name="code"> +/* Some example CSS */ + +@import url("something.css"); + +body { + margin: 0; + padding: 3em 6em; + font-family: tahoma, arial, sans-serif; + color: #000; +} + +#navigation a { + font-weight: bold; + text-decoration: none !important; +} + +h1 { + font-size: 2.5em; +} + +h2 { + font-size: 1.7em; +} + +h1:before, h2:before { + content: "::"; +} + +code { + font-family: courier, monospace; + font-size: 80%; + color: #418A8A; +} +</textarea></form> + <script> + var editor = CodeMirror.fromTextArea(document.getElementById("code"), {}); + </script> + + <p><strong>MIME types defined:</strong> <code>text/css</code>.</p> + + </body> +</html> Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/diff/diff.css =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/diff/diff.css (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/diff/diff.css 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,3 @@ +.cm-s-default span.cm-rangeinfo {color: #a0b;} +.cm-s-default span.cm-minus {color: #a22;} +.cm-s-default span.cm-plus {color: #2b2;} Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/diff/diff.js =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/diff/diff.js (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/diff/diff.js 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,13 @@ +CodeMirror.defineMode("diff", function() { + return { + token: function(stream) { + var ch = stream.next(); + stream.skipToEnd(); + if (ch == "+") return "plus"; + if (ch == "-") return "minus"; + if (ch == "@") return "rangeinfo"; + } + }; +}); + +CodeMirror.defineMIME("text/x-diff", "diff"); Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/diff/index.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/diff/index.html (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/diff/index.html 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,99 @@ +<!doctype html> +<html> + <head> + <title>CodeMirror 2: Diff mode</title> + <link rel="stylesheet" href="../../lib/codemirror.css"> + <script src="../../lib/codemirror.js"></script> + <script src="diff.js"></script> + <link rel="stylesheet" href="diff.css"> + <style>.CodeMirror {border-top: 1px solid #ddd; border-bottom: 1px solid #ddd;}</style> + <link rel="stylesheet" href="../../css/docs.css"> + </head> + <body> + <h1>CodeMirror 2: Diff mode</h1> + <form><textarea id="code" name="code"> +diff --git a/index.html b/index.html +index c1d9156..7764744 100644 +--- a/index.html ++++ b/index.html +@@ -95,7 +95,8 @@ StringStream.prototype = { + <script> + var editor = CodeMirror.fromTextArea(document.getElementById("code"), { + lineNumbers: true, +- autoMatchBrackets: true ++ autoMatchBrackets: true, ++ onGutterClick: function(x){console.log(x);} + }); + </script> + </body> +diff --git a/lib/codemirror.js b/lib/codemirror.js +index 04646a9..9a39cc7 100644 +--- a/lib/codemirror.js ++++ b/lib/codemirror.js +@@ -399,10 +399,16 @@ var CodeMirror = (function() { + } + + function onMouseDown(e) { +- var start = posFromMouse(e), last = start; ++ var start = posFromMouse(e), last = start, target = e.target(); + if (!start) return; + setCursor(start.line, start.ch, false); + if (e.button() != 1) return; ++ if (target.parentNode == gutter) { ++ if (options.onGutterClick) ++ options.onGutterClick(indexOf(gutter.childNodes, target) + showingFrom); ++ return; ++ } ++ + if (!focused) onFocus(); + + e.stop(); +@@ -808,7 +814,7 @@ var CodeMirror = (function() { + for (var i = showingFrom; i < showingTo; ++i) { + var marker = lines[i].gutterMarker; + if (marker) html.push('<div class="' + marker.style + '">' + htmlEscape(marker.text) + '</div>'); +- else html.push("<div>" + (options.lineNumbers ? i + 1 : "\u00a0") + "</div>"); ++ else html.push("<div>" + (options.lineNumbers ? i + options.firstLineNumber : "\u00a0") + "</div>"); + } + gutter.style.display = "none"; // TODO test whether this actually helps + gutter.innerHTML = html.join(""); +@@ -1371,10 +1377,8 @@ var CodeMirror = (function() { + if (option == "parser") setParser(value); + else if (option === "lineNumbers") setLineNumbers(value); + else if (option === "gutter") setGutter(value); +- else if (option === "readOnly") options.readOnly = value; +- else if (option === "indentUnit") {options.indentUnit = indentUnit = value; setParser(options.parser);} +- else if (/^(?:enterMode|tabMode|indentWithTabs|readOnly|autoMatchBrackets|undoDepth)$/.test(option)) options[option] = value; +- else throw new Error("Can't set option " + option); ++ else if (option === "indentUnit") {options.indentUnit = value; setParser(options.parser);} ++ else options[option] = value; + }, + cursorCoords: cursorCoords, + undo: operation(undo), +@@ -1402,7 +1406,8 @@ var CodeMirror = (function() { + replaceRange: operation(replaceRange), + + operation: function(f){return operation(f)();}, +- refresh: function(){updateDisplay([{from: 0, to: lines.length}]);} ++ refresh: function(){updateDisplay([{from: 0, to: lines.length}]);}, ++ getInputField: function(){return input;} + }; + return instance; + } +@@ -1420,6 +1425,7 @@ var CodeMirror = (function() { + readOnly: false, + onChange: null, + onCursorActivity: null, ++ onGutterClick: null, + autoMatchBrackets: false, + workTime: 200, + workDelay: 300, +</textarea></form> + <script> + var editor = CodeMirror.fromTextArea(document.getElementById("code"), {}); + </script> + + <p><strong>MIME types defined:</strong> <code>text/x-diff</code>.</p> + + </body> +</html> Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/haskell/haskell.js =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/haskell/haskell.js (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/haskell/haskell.js 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,242 @@ +CodeMirror.defineMode("haskell", function(cmCfg, modeCfg) { + + function switchState(source, setState, f) { + setState(f); + return f(source, setState); + } + + // These should all be Unicode extended, as per the Haskell 2010 report + var smallRE = /[a-z_]/; + var largeRE = /[A-Z]/; + var digitRE = /[0-9]/; + var hexitRE = /[0-9A-Fa-f]/; + var octitRE = /[0-7]/; + var idRE = /[a-z_A-Z0-9']/; + var symbolRE = /[-!#$%&*+.\/<=>?@\\^|~:]/; + var specialRE = /[(),;[\]`{}]/; + var whiteCharRE = /[ \t\v\f]/; // newlines are handled in tokenizer + + function normal(source, setState) { + if (source.eatWhile(whiteCharRE)) { + return null; + } + + var ch = source.next(); + if (specialRE.test(ch)) { + if (ch == '{' && source.eat('-')) { + var t = "comment"; + if (source.eat('#')) { + t = "meta"; + } + return switchState(source, setState, ncomment(t, 1)); + } + return null; + } + + if (ch == '\'') { + if (source.eat('\\')) { + source.next(); // should handle other escapes here + } + else { + source.next(); + } + if (source.eat('\'')) { + return "string"; + } + return "error"; + } + + if (ch == '"') { + return switchState(source, setState, stringLiteral); + } + + if (largeRE.test(ch)) { + source.eatWhile(idRE); + if (source.eat('.')) { + return "qualifier"; + } + return "variable-2"; + } + + if (smallRE.test(ch)) { + source.eatWhile(idRE); + return "variable"; + } + + if (digitRE.test(ch)) { + if (ch == '0') { + if (source.eat(/[xX]/)) { + source.eatWhile(hexitRE); // should require at least 1 + return "integer"; + } + if (source.eat(/[oO]/)) { + source.eatWhile(octitRE); // should require at least 1 + return "number"; + } + } + source.eatWhile(digitRE); + var t = "number"; + if (source.eat('.')) { + t = "number"; + source.eatWhile(digitRE); // should require at least 1 + } + if (source.eat(/[eE]/)) { + t = "number"; + source.eat(/[-+]/); + source.eatWhile(digitRE); // should require at least 1 + } + return t; + } + + if (symbolRE.test(ch)) { + if (ch == '-' && source.eat(/-/)) { + source.eatWhile(/-/); + if (!source.eat(symbolRE)) { + source.skipToEnd(); + return "comment"; + } + } + var t = "variable"; + if (ch == ':') { + t = "variable-2"; + } + source.eatWhile(symbolRE); + return t; + } + + return "error"; + } + + function ncomment(type, nest) { + if (nest == 0) { + return normal; + } + return function(source, setState) { + var currNest = nest; + while (!source.eol()) { + var ch = source.next(); + if (ch == '{' && source.eat('-')) { + ++currNest; + } + else if (ch == '-' && source.eat('}')) { + --currNest; + if (currNest == 0) { + setState(normal); + return type; + } + } + } + setState(ncomment(type, currNest)); + return type; + } + } + + function stringLiteral(source, setState) { + while (!source.eol()) { + var ch = source.next(); + if (ch == '"') { + setState(normal); + return "string"; + } + if (ch == '\\') { + if (source.eol() || source.eat(whiteCharRE)) { + setState(stringGap); + return "string"; + } + if (source.eat('&')) { + } + else { + source.next(); // should handle other escapes here + } + } + } + setState(normal); + return "error"; + } + + function stringGap(source, setState) { + if (source.eat('\\')) { + return switchState(source, setState, stringLiteral); + } + source.next(); + setState(normal); + return "error"; + } + + + var wellKnownWords = (function() { + var wkw = {}; + function setType(t) { + return function () { + for (var i = 0; i < arguments.length; i++) + wkw[arguments[i]] = t; + } + } + + setType("keyword")( + "case", "class", "data", "default", "deriving", "do", "else", "foreign", + "if", "import", "in", "infix", "infixl", "infixr", "instance", "let", + "module", "newtype", "of", "then", "type", "where", "_"); + + setType("keyword")( + "\.\.", ":", "::", "=", "\\", "\"", "<-", "->", "@", "~", "=>"); + + setType("builtin")( + "!!", "$!", "$", "&&", "+", "++", "-", ".", "/", "/=", "<", "<=", "=<<", + "==", ">", ">=", ">>", ">>=", "^", "^^", "||", "*", "**"); + + setType("builtin")( + "Bool", "Bounded", "Char", "Double", "EQ", "Either", "Enum", "Eq", + "False", "FilePath", "Float", "Floating", "Fractional", "Functor", "GT", + "IO", "IOError", "Int", "Integer", "Integral", "Just", "LT", "Left", + "Maybe", "Monad", "Nothing", "Num", "Ord", "Ordering", "Rational", "Read", + "ReadS", "Real", "RealFloat", "RealFrac", "Right", "Show", "ShowS", + "String", "True"); + + setType("builtin")( + "abs", "acos", "acosh", "all", "and", "any", "appendFile", "asTypeOf", + "asin", "asinh", "atan", "atan2", "atanh", "break", "catch", "ceiling", + "compare", "concat", "concatMap", "const", "cos", "cosh", "curry", + "cycle", "decodeFloat", "div", "divMod", "drop", "dropWhile", "either", + "elem", "encodeFloat", "enumFrom", "enumFromThen", "enumFromThenTo", + "enumFromTo", "error", "even", "exp", "exponent", "fail", "filter", + "flip", "floatDigits", "floatRadix", "floatRange", "floor", "fmap", + "foldl", "foldl1", "foldr", "foldr1", "fromEnum", "fromInteger", + "fromIntegral", "fromRational", "fst", "gcd", "getChar", "getContents", + "getLine", "head", "id", "init", "interact", "ioError", "isDenormalized", + "isIEEE", "isInfinite", "isNaN", "isNegativeZero", "iterate", "last", + "lcm", "length", "lex", "lines", "log", "logBase", "lookup", "map", + "mapM", "mapM_", "max", "maxBound", "maximum", "maybe", "min", "minBound", + "minimum", "mod", "negate", "not", "notElem", "null", "odd", "or", + "otherwise", "pi", "pred", "print", "product", "properFraction", + "putChar", "putStr", "putStrLn", "quot", "quotRem", "read", "readFile", + "readIO", "readList", "readLn", "readParen", "reads", "readsPrec", + "realToFrac", "recip", "rem", "repeat", "replicate", "return", "reverse", + "round", "scaleFloat", "scanl", "scanl1", "scanr", "scanr1", "seq", + "sequence", "sequence_", "show", "showChar", "showList", "showParen", + "showString", "shows", "showsPrec", "significand", "signum", "sin", + "sinh", "snd", "span", "splitAt", "sqrt", "subtract", "succ", "sum", + "tail", "take", "takeWhile", "tan", "tanh", "toEnum", "toInteger", + "toRational", "truncate", "uncurry", "undefined", "unlines", "until", + "unwords", "unzip", "unzip3", "userError", "words", "writeFile", "zip", + "zip3", "zipWith", "zipWith3"); + + return wkw; + })(); + + + + return { + startState: function () { return { f: normal }; }, + copyState: function (s) { return { f: s.f }; }, + + token: function(stream, state) { + var t = state.f(stream, function(s) { state.f = s; }); + var w = stream.current(); + return (w in wellKnownWords) ? wellKnownWords[w] : t; + } + }; + +}); + +CodeMirror.defineMIME("text/x-haskell", "haskell"); Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/haskell/index.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/haskell/index.html (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/haskell/index.html 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,60 @@ +<!doctype html> +<html> + <head> + <title>CodeMirror 2: Haskell mode</title> + <link rel="stylesheet" href="../../lib/codemirror.css"> + <script src="../../lib/codemirror.js"></script> + <script src="haskell.js"></script> + <link rel="stylesheet" href="../../theme/elegant.css"> + <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style> + <link rel="stylesheet" href="../../css/docs.css"> + </head> + <body> + <h1>CodeMirror 2: Haskell mode</h1> + +<form><textarea id="code" name="code"> +module UniquePerms ( + uniquePerms + ) +where + +-- | Find all unique permutations of a list where there might be duplicates. +uniquePerms :: (Eq a) => [a] -> [[a]] +uniquePerms = permBag . makeBag + +-- | An unordered collection where duplicate values are allowed, +-- but represented with a single value and a count. +type Bag a = [(a, Int)] + +makeBag :: (Eq a) => [a] -> Bag a +makeBag [] = [] +makeBag (a:as) = mix a $ makeBag as + where + mix a [] = [(a,1)] + mix a (bn@(b,n):bs) | a == b = (b,n+1):bs + | otherwise = bn : mix a bs + +permBag :: Bag a -> [[a]] +permBag [] = [[]] +permBag bs = concatMap (\(f,cs) -> map (f:) $ permBag cs) . oneOfEach $ bs + where + oneOfEach [] = [] + oneOfEach (an@(a,n):bs) = + let bs' = if n == 1 then bs else (a,n-1):bs + in (a,bs') : mapSnd (an:) (oneOfEach bs) + + apSnd f (a,b) = (a, f b) + mapSnd = map . apSnd +</textarea></form> + + <script> + var editor = CodeMirror.fromTextArea(document.getElementById("code"), { + lineNumbers: true, + matchBrackets: true, + theme: "elegant" + }); + </script> + + <p><strong>MIME types defined:</strong> <code>text/x-haskell</code>.</p> + </body> +</html> Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/htmlmixed/htmlmixed.js =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/htmlmixed/htmlmixed.js (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/htmlmixed/htmlmixed.js 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,74 @@ +CodeMirror.defineMode("htmlmixed", function(config, parserConfig) { + var htmlMode = CodeMirror.getMode(config, {name: "xml", htmlMode: true}); + var jsMode = CodeMirror.getMode(config, "javascript"); + var cssMode = CodeMirror.getMode(config, "css"); + + function html(stream, state) { + var style = htmlMode.token(stream, state.htmlState); + if (style == "tag" && stream.current() == ">" && state.htmlState.context) { + if (/^script$/i.test(state.htmlState.context.tagName)) { + state.token = javascript; + state.localState = jsMode.startState(htmlMode.indent(state.htmlState, "")); + } + else if (/^style$/i.test(state.htmlState.context.tagName)) { + state.token = css; + state.localState = cssMode.startState(htmlMode.indent(state.htmlState, "")); + } + } + return style; + } + function maybeBackup(stream, pat, style) { + var cur = stream.current(); + var close = cur.search(pat); + if (close > -1) stream.backUp(cur.length - close); + return style; + } + function javascript(stream, state) { + if (stream.match(/^<\/\s*script\s*>/i, false)) { + state.token = html; + state.curState = null; + return html(stream, state); + } + return maybeBackup(stream, /<\/\s*script\s*>/, + jsMode.token(stream, state.localState)); + } + function css(stream, state) { + if (stream.match(/^<\/\s*style\s*>/i, false)) { + state.token = html; + state.localState = null; + return html(stream, state); + } + return maybeBackup(stream, /<\/\s*style\s*>/, + cssMode.token(stream, state.localState)); + } + + return { + startState: function() { + var state = htmlMode.startState(); + return {token: html, localState: null, htmlState: state}; + }, + + copyState: function(state) { + if (state.localState) + var local = CodeMirror.copyState(state.token == css ? cssMode : jsMode, state.localState); + return {token: state.token, localState: local, htmlState: CodeMirror.copyState(htmlMode, state.htmlState)}; + }, + + token: function(stream, state) { + return state.token(stream, state); + }, + + indent: function(state, textAfter) { + if (state.token == html || /^\s*<\//.test(textAfter)) + return htmlMode.indent(state.htmlState, textAfter); + else if (state.token == javascript) + return jsMode.indent(state.localState, textAfter); + else + return cssMode.indent(state.localState, textAfter); + }, + + electricChars: "/{}:" + } +}); + +CodeMirror.defineMIME("text/html", "htmlmixed"); Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/htmlmixed/index.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/htmlmixed/index.html (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/htmlmixed/index.html 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,52 @@ +<!doctype html> +<html> + <head> + <title>CodeMirror 2: HTML mixed mode</title> + <link rel="stylesheet" href="../../lib/codemirror.css"> + <script src="../../lib/codemirror.js"></script> + <script src="../xml/xml.js"></script> + <script src="../javascript/javascript.js"></script> + <script src="../css/css.js"></script> + <link rel="stylesheet" href="../../theme/default.css"> + <script src="htmlmixed.js"></script> + <link rel="stylesheet" href="../../css/docs.css"> + <style>.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style> + </head> + <body> + <h1>CodeMirror 2: HTML mixed mode</h1> + <form><textarea id="code" name="code"> +<html style="color: green"> +  + <head> + <title>Mixed HTML Example</title> + <style type="text/css"> + h1 {font-family: comic sans; color: #f0f;} + div {background: yellow !important;} + body { + max-width: 50em; + margin: 1em 2em 1em 5em; + } + </style> + </head> + <body> + <h1>Mixed HTML Example</h1> + <script> + function jsFunc(arg1, arg2) { + if (arg1 && arg2) document.body.innerHTML = "achoo"; + } + </script> + </body> +</html> +</textarea></form> + <script> + var editor = CodeMirror.fromTextArea(document.getElementById("code"), {mode: "text/html", tabMode: "indent"}); + </script> + + <p>The HTML mixed mode depends on the XML, JavaScript, and CSS modes.</p> + + <p><strong>MIME types defined:</strong> <code>text/html</code> + (redefined, only takes effect if you load this parser after the + XML parser).</p> + + </body> +</html> Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/javascript/index.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/javascript/index.html (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/javascript/index.html 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,78 @@ +<!doctype html> +<html> + <head> + <title>CodeMirror 2: JavaScript mode</title> + <link rel="stylesheet" href="../../lib/codemirror.css"> + <script src="../../lib/codemirror.js"></script> + <script src="javascript.js"></script> + <link rel="stylesheet" href="../../theme/default.css"> + <link rel="stylesheet" href="../../css/docs.css"> + <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style> + </head> + <body> + <h1>CodeMirror 2: JavaScript mode</h1> + +<div><textarea id="code" name="code"> +// Demo code (the actual new parser character stream implementation) + +function StringStream(string) { + this.pos = 0; + this.string = string; +} + +StringStream.prototype = { + done: function() {return this.pos >= this.string.length;}, + peek: function() {return this.string.charAt(this.pos);}, + next: function() { + if (this.pos < this.string.length) + return this.string.charAt(this.pos++); + }, + eat: function(match) { + var ch = this.string.charAt(this.pos); + if (typeof match == "string") var ok = ch == match; + else var ok = ch && match.test ? match.test(ch) : match(ch); + if (ok) {this.pos++; return ch;} + }, + eatWhile: function(match) { + var start = this.pos; + while (this.eat(match)); + if (this.pos > start) return this.string.slice(start, this.pos); + }, + backUp: function(n) {this.pos -= n;}, + column: function() {return this.pos;}, + eatSpace: function() { + var start = this.pos; + while (/\s/.test(this.string.charAt(this.pos))) this.pos++; + return this.pos - start; + }, + match: function(pattern, consume, caseInsensitive) { + if (typeof pattern == "string") { + function cased(str) {return caseInsensitive ? str.toLowerCase() : str;} + if (cased(this.string).indexOf(cased(pattern), this.pos) == this.pos) { + if (consume !== false) this.pos += str.length; + return true; + } + } + else { + var match = this.string.slice(this.pos).match(pattern); + if (match && consume !== false) this.pos += match[0].length; + return match; + } + } +}; +</textarea></div> + + <script> + var editor = CodeMirror.fromTextArea(document.getElementById("code"), { + lineNumbers: true, + matchBrackets: true + }); + </script> + + <p>JavaScript mode supports a single configuration + option, <code>json</code>, which will set the mode to expect JSON + data rather than a JavaScript program.</p> + + <p><strong>MIME types defined:</strong> <code>text/javascript</code>, <code>application/json</code>.</p> + </body> +</html> Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/javascript/javascript.js =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/javascript/javascript.js (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/javascript/javascript.js 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,348 @@ +CodeMirror.defineMode("javascript", function(config, parserConfig) { + var indentUnit = config.indentUnit; + var jsonMode = parserConfig.json; + + // Tokenizer + + var keywords = function(){ + function kw(type) {return {type: type, style: "keyword"};} + var A = kw("keyword a"), B = kw("keyword b"), C = kw("keyword c"); + var operator = kw("operator"), atom = {type: "atom", style: "atom"}; + return { + "if": A, "while": A, "with": A, "else": B, "do": B, "try": B, "finally": B, + "return": C, "break": C, "continue": C, "new": C, "delete": C, "throw": C, + "var": kw("var"), "function": kw("function"), "catch": kw("catch"), + "for": kw("for"), "switch": kw("switch"), "case": kw("case"), "default": kw("default"), + "in": operator, "typeof": operator, "instanceof": operator, + "true": atom, "false": atom, "null": atom, "undefined": atom, "NaN": atom, "Infinity": atom + }; + }(); + + var isOperatorChar = /[+\-*&%=<>!?|]/; + + function chain(stream, state, f) { + state.tokenize = f; + return f(stream, state); + } + + function nextUntilUnescaped(stream, end) { + var escaped = false, next; + while ((next = stream.next()) != null) { + if (next == end && !escaped) + return false; + escaped = !escaped && next == "\\"; + } + return escaped; + } + + // Used as scratch variables to communicate multiple values without + // consing up tons of objects. + var type, content; + function ret(tp, style, cont) { + type = tp; content = cont; + return style; + } + + function jsTokenBase(stream, state) { + var ch = stream.next(); + if (ch == '"' || ch == "'") + return chain(stream, state, jsTokenString(ch)); + else if (/[\[\]{},;\:\.]/.test(ch)) + return ret(ch); + else if (ch == "0" && stream.eat(/x/i)) { + stream.eatWhile(/[\da-f]/i); + return ret("number", "atom"); + } + else if (/\d/.test(ch)) { + stream.match(/^\d*(?:\.\d*)?(?:e[+\-]?\d+)?/); + return ret("number", "atom"); + } + else if (ch == "/") { + if (stream.eat("*")) { + return chain(stream, state, jsTokenComment); + } + else if (stream.eat("/")) { + stream.skipToEnd(); + return ret("comment", "comment"); + } + else if (state.reAllowed) { + nextUntilUnescaped(stream, "/"); + stream.eatWhile(/[gimy]/); // 'y' is "sticky" option in Mozilla + return ret("regexp", "string"); + } + else { + stream.eatWhile(isOperatorChar); + return ret("operator", null, stream.current()); + } + } + else if (isOperatorChar.test(ch)) { + stream.eatWhile(isOperatorChar); + return ret("operator", null, stream.current()); + } + else { + stream.eatWhile(/[\w\$_]/); + var word = stream.current(), known = keywords.propertyIsEnumerable(word) && keywords[word]; + return known ? ret(known.type, known.style, word) : + ret("variable", "variable", word); + } + } + + function jsTokenString(quote) { + return function(stream, state) { + if (!nextUntilUnescaped(stream, quote)) + state.tokenize = jsTokenBase; + return ret("string", "string"); + }; + } + + function jsTokenComment(stream, state) { + var maybeEnd = false, ch; + while (ch = stream.next()) { + if (ch == "/" && maybeEnd) { + state.tokenize = jsTokenBase; + break; + } + maybeEnd = (ch == "*"); + } + return ret("comment", "comment"); + } + + // Parser + + var atomicTypes = {"atom": true, "number": true, "variable": true, "string": true, "regexp": true}; + + function JSLexical(indented, column, type, align, prev, info) { + this.indented = indented; + this.column = column; + this.type = type; + this.prev = prev; + this.info = info; + if (align != null) this.align = align; + } + + function inScope(state, varname) { + for (var v = state.localVars; v; v = v.next) + if (v.name == varname) return true; + } + + function parseJS(state, style, type, content, stream) { + var cc = state.cc; + // Communicate our context to the combinators. + // (Less wasteful than consing up a hundred closures on every call.) + cx.state = state; cx.stream = stream; cx.marked = null, cx.cc = cc; + + if (!state.lexical.hasOwnProperty("align")) + state.lexical.align = true; + + while(true) { + var combinator = cc.length ? cc.pop() : jsonMode ? expression : statement; + if (combinator(type, content)) { + while(cc.length && cc[cc.length - 1].lex) + cc.pop()(); + if (cx.marked) return cx.marked; + if (type == "variable" && inScope(state, content)) return "variable-2"; + return style; + } + } + } + + // Combinator utils + + var cx = {state: null, column: null, marked: null, cc: null}; + function pass() { + for (var i = arguments.length - 1; i >= 0; i--) cx.cc.push(arguments[i]); + } + function cont() { + pass.apply(null, arguments); + return true; + } + function register(varname) { + var state = cx.state; + if (state.context) { + cx.marked = "def"; + for (var v = state.localVars; v; v = v.next) + if (v.name == varname) return; + state.localVars = {name: varname, next: state.localVars}; + } + } + + // Combinators + + var defaultVars = {name: "this", next: {name: "arguments"}}; + function pushcontext() { + if (!cx.state.context) cx.state.localVars = defaultVars; + cx.state.context = {prev: cx.state.context, vars: cx.state.localVars}; + } + function popcontext() { + cx.state.localVars = cx.state.context.vars; + cx.state.context = cx.state.context.prev; + } + function pushlex(type, info) { + var result = function() { + var state = cx.state; + state.lexical = new JSLexical(state.indented, cx.stream.column(), type, null, state.lexical, info) + }; + result.lex = true; + return result; + } + function poplex() { + var state = cx.state; + if (state.lexical.prev) { + if (state.lexical.type == ")") + state.indented = state.lexical.indented; + state.lexical = state.lexical.prev; + } + } + poplex.lex = true; + + function expect(wanted) { + return function expecting(type) { + if (type == wanted) return cont(); + else if (wanted == ";") return pass(); + else return cont(arguments.callee); + }; + } + + function statement(type) { + if (type == "var") return cont(pushlex("vardef"), vardef1, expect(";"), poplex); + if (type == "keyword a") return cont(pushlex("form"), expression, statement, poplex); + if (type == "keyword b") return cont(pushlex("form"), statement, poplex); + if (type == "{") return cont(pushlex("}"), block, poplex); + if (type == ";") return cont(); + if (type == "function") return cont(functiondef); + if (type == "for") return cont(pushlex("form"), expect("("), pushlex(")"), forspec1, expect(")"), + poplex, statement, poplex); + if (type == "variable") return cont(pushlex("stat"), maybelabel); + if (type == "switch") return cont(pushlex("form"), expression, pushlex("}", "switch"), expect("{"), + block, poplex, poplex); + if (type == "case") return cont(expression, expect(":")); + if (type == "default") return cont(expect(":")); + if (type == "catch") return cont(pushlex("form"), pushcontext, expect("("), funarg, expect(")"), + statement, poplex, popcontext); + return pass(pushlex("stat"), expression, expect(";"), poplex); + } + function expression(type) { + if (atomicTypes.hasOwnProperty(type)) return cont(maybeoperator); + if (type == "function") return cont(functiondef); + if (type == "keyword c") return cont(expression); + if (type == "(") return cont(pushlex(")"), expression, expect(")"), poplex, maybeoperator); + if (type == "operator") return cont(expression); + if (type == "[") return cont(pushlex("]"), commasep(expression, "]"), poplex, maybeoperator); + if (type == "{") return cont(pushlex("}"), commasep(objprop, "}"), poplex, maybeoperator); + return cont(); + } + function maybeoperator(type, value) { + if (type == "operator" && /\+\+|--/.test(value)) return cont(maybeoperator); + if (type == "operator") return cont(expression); + if (type == ";") return; + if (type == "(") return cont(pushlex(")"), commasep(expression, ")"), poplex, maybeoperator); + if (type == ".") return cont(property, maybeoperator); + if (type == "[") return cont(pushlex("]"), expression, expect("]"), poplex, maybeoperator); + } + function maybelabel(type) { + if (type == ":") return cont(poplex, statement); + return pass(maybeoperator, expect(";"), poplex); + } + function property(type) { + if (type == "variable") {cx.marked = "property"; return cont();} + } + function objprop(type) { + if (type == "variable") cx.marked = "property"; + if (atomicTypes.hasOwnProperty(type)) return cont(expect(":"), expression); + } + function commasep(what, end) { + function proceed(type) { + if (type == ",") return cont(what, proceed); + if (type == end) return cont(); + return cont(expect(end)); + } + return function commaSeparated(type) { + if (type == end) return cont(); + else return pass(what, proceed); + }; + } + function block(type) { + if (type == "}") return cont(); + return pass(statement, block); + } + function vardef1(type, value) { + if (type == "variable"){register(value); return cont(vardef2);} + return cont(); + } + function vardef2(type, value) { + if (value == "=") return cont(expression, vardef2); + if (type == ",") return cont(vardef1); + } + function forspec1(type) { + if (type == "var") return cont(vardef1, forspec2); + if (type == ";") return pass(forspec2); + if (type == "variable") return cont(formaybein); + return pass(forspec2); + } + function formaybein(type, value) { + if (value == "in") return cont(expression); + return cont(maybeoperator, forspec2); + } + function forspec2(type, value) { + if (type == ";") return cont(forspec3); + if (value == "in") return cont(expression); + return cont(expression, expect(";"), forspec3); + } + function forspec3(type) { + if (type != ")") cont(expression); + } + function functiondef(type, value) { + if (type == "variable") {register(value); return cont(functiondef);} + if (type == "(") return cont(pushlex(")"), pushcontext, commasep(funarg, ")"), poplex, statement, popcontext); + } + function funarg(type, value) { + if (type == "variable") {register(value); return cont();} + } + + // Interface + + return { + startState: function(basecolumn) { + return { + tokenize: jsTokenBase, + reAllowed: true, + cc: [], + lexical: new JSLexical((basecolumn || 0) - indentUnit, 0, "block", false), + localVars: null, + context: null, + indented: 0 + }; + }, + + token: function(stream, state) { + if (stream.sol()) { + if (!state.lexical.hasOwnProperty("align")) + state.lexical.align = false; + state.indented = stream.indentation(); + } + if (stream.eatSpace()) return null; + var style = state.tokenize(stream, state); + if (type == "comment") return style; + state.reAllowed = type == "operator" || type == "keyword c" || type.match(/^[\[{}\(,;:]$/); + return parseJS(state, style, type, content, stream); + }, + + indent: function(state, textAfter) { + if (state.tokenize != jsTokenBase) return 0; + var firstChar = textAfter && textAfter.charAt(0), lexical = state.lexical, + type = lexical.type, closing = firstChar == type; + if (type == "vardef") return lexical.indented + 4; + else if (type == "form" && firstChar == "{") return lexical.indented; + else if (type == "stat" || type == "form") return lexical.indented + indentUnit; + else if (lexical.info == "switch" && !closing) + return lexical.indented + (/^(?:case|default)\b/.test(textAfter) ? indentUnit : 2 * indentUnit); + else if (lexical.align) return lexical.column + (closing ? 0 : 1); + else return lexical.indented + (closing ? 0 : indentUnit); + }, + + electricChars: ":{}" + }; +}); + +CodeMirror.defineMIME("text/javascript", "javascript"); +CodeMirror.defineMIME("application/json", {name: "javascript", json: true}); Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/lua/index.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/lua/index.html (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/lua/index.html 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,72 @@ +<!doctype html> +<html> + <head> + <title>CodeMirror 2: Lua mode</title> + <link rel="stylesheet" href="../../lib/codemirror.css"> + <script src="../../lib/codemirror.js"></script> + <script src="lua.js"></script> + <link rel="stylesheet" href="../../theme/neat.css"> + <style>.CodeMirror {border: 1px solid black;}</style> + <link rel="stylesheet" href="../../css/docs.css"> + </head> + <body> + <h1>CodeMirror 2: Lua mode</h1> + <form><textarea id="code" name="code"> +--[[ +example useless code to show lua syntax highlighting +this is multiline comment +]] + +function blahblahblah(x) + + local table = { + "asd" = 123, + "x" = 0.34, + } + if x ~= 3 then + print( x ) + elseif x == "string" + my_custom_function( 0x34 ) + else + unknown_function( "some string" ) + end + + --single line comment + +end + +function blablabla3() + + for k,v in ipairs( table ) do + --abcde.. + y=[=[ + x=[[ + x is a multi line string + ]] + but its definition is iside a highest level string! + ]=] + print(" \"\" ") + + s = math.sin( x ) + end + +end +</textarea></form> + <script> + var editor = CodeMirror.fromTextArea(document.getElementById("code"), { + tabMode: "indent", + matchBrackets: true, + theme: "neat" + }); + </script> + + <p>Loosely based on Franciszek + Wawrzak's <a href="http://codemirror.net/1/contrib/lua">CodeMirror + 1 mode</a>. One configuration parameter is + supported, <code>specials</code>, to which you can provide an + array of strings to have those identifiers highlighted with + the <code>lua-special</code> style.</p> + <p><strong>MIME types defined:</strong> <code>text/x-lua</code>.</p> + + </body> +</html> Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/lua/lua.js =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/lua/lua.js (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/lua/lua.js 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,138 @@ +// LUA mode. Ported to CodeMirror 2 from Franciszek Wawrzak's +// CodeMirror 1 mode. +// highlights keywords, strings, comments (no leveling supported! ("[==[")), tokens, basic indenting + +CodeMirror.defineMode("lua", function(config, parserConfig) { + var indentUnit = config.indentUnit; + + function prefixRE(words) { + return new RegExp("^(?:" + words.join("|") + ")", "i"); + } + function wordRE(words) { + return new RegExp("^(?:" + words.join("|") + ")$", "i"); + } + var specials = wordRE(parserConfig.specials || []); + + // long list of standard functions from lua manual + var builtins = wordRE([ + "_G","_VERSION","assert","collectgarbage","dofile","error","getfenv","getmetatable","ipairs","load", + "loadfile","loadstring","module","next","pairs","pcall","print","rawequal","rawget","rawset","require", + "select","setfenv","setmetatable","tonumber","tostring","type","unpack","xpcall", + + "coroutine.create","coroutine.resume","coroutine.running","coroutine.status","coroutine.wrap","coroutine.yield", + + "debug.debug","debug.getfenv","debug.gethook","debug.getinfo","debug.getlocal","debug.getmetatable", + "debug.getregistry","debug.getupvalue","debug.setfenv","debug.sethook","debug.setlocal","debug.setmetatable", + "debug.setupvalue","debug.traceback", + + "close","flush","lines","read","seek","setvbuf","write", + + "io.close","io.flush","io.input","io.lines","io.open","io.output","io.popen","io.read","io.stderr","io.stdin", + "io.stdout","io.tmpfile","io.type","io.write", + + "math.abs","math.acos","math.asin","math.atan","math.atan2","math.ceil","math.cos","math.cosh","math.deg", + "math.exp","math.floor","math.fmod","math.frexp","math.huge","math.ldexp","math.log","math.log10","math.max", + "math.min","math.modf","math.pi","math.pow","math.rad","math.random","math.randomseed","math.sin","math.sinh", + "math.sqrt","math.tan","math.tanh", + + "os.clock","os.date","os.difftime","os.execute","os.exit","os.getenv","os.remove","os.rename","os.setlocale", + "os.time","os.tmpname", + + "package.cpath","package.loaded","package.loaders","package.loadlib","package.path","package.preload", + "package.seeall", + + "string.byte","string.char","string.dump","string.find","string.format","string.gmatch","string.gsub", + "string.len","string.lower","string.match","string.rep","string.reverse","string.sub","string.upper", + + "table.concat","table.insert","table.maxn","table.remove","table.sort" + ]); + var keywords = wordRE(["and","break","elseif","false","nil","not","or","return", + "true","function", "end", "if", "then", "else", "do", + "while", "repeat", "until", "for", "in", "local" ]); + + var indentTokens = wordRE(["function", "if","repeat","for","while", "\$", "{"]); + var dedentTokens = wordRE(["end", "until", "\$", "}"]); + var dedentPartial = prefixRE(["end", "until", "\\)", "}", "else", "elseif"]); + + function readBracket(stream) { + var level = 0; + while (stream.eat("=")) ++level; + stream.eat("["); + return level; + } + + function normal(stream, state) { + var ch = stream.next(); + if (ch == "-" && stream.eat("-")) { + if (stream.eat("[")) + return (state.cur = bracketed(readBracket(stream), "comment"))(stream, state); + stream.skipToEnd(); + return "comment"; + } + if (ch == "\"" || ch == "'") + return (state.cur = string(ch))(stream, state); + if (ch == "[" && /[\[=]/.test(stream.peek())) + return (state.cur = bracketed(readBracket(stream), "string"))(stream, state); + if (/\d/.test(ch)) { + stream.eatWhile(/[\w.%]/); + return "number"; + } + if (/[\w_]/.test(ch)) { + stream.eatWhile(/[\w\\\-_.]/); + return "variable"; + } + return null; + } + + function bracketed(level, style) { + return function(stream, state) { + var curlev = null, ch; + while ((ch = stream.next()) != null) { + if (curlev == null) {if (ch == "]") curlev = 0;} + else if (ch == "=") ++curlev; + else if (ch == "]" && curlev == level) { state.cur = normal; break; } + else curlev = null; + } + return style; + }; + } + + function string(quote) { + return function(stream, state) { + var escaped = false, ch; + while ((ch = stream.next()) != null) { + if (ch == quote && !escaped) break; + escaped = !escaped && ch == "\\"; + } + if (!escaped) state.cur = normal; + return "string"; + }; + } + + return { + startState: function(basecol) { + return {basecol: basecol || 0, indentDepth: 0, cur: normal}; + }, + + token: function(stream, state) { + if (stream.eatSpace()) return null; + var style = state.cur(stream, state); + var word = stream.current(); + if (style == "variable") { + if (keywords.test(word)) style = "keyword"; + else if (builtins.test(word)) style = "builtin"; + else if (specials.test(word)) style = "variable-2"; + } + if (indentTokens.test(word)) ++state.indentDepth; + else if (dedentTokens.test(word)) --state.indentDepth; + return style; + }, + + indent: function(state, textAfter) { + var closing = dedentPartial.test(textAfter); + return state.basecol + indentUnit * (state.indentDepth - (closing ? 1 : 0)); + } + }; +}); + +CodeMirror.defineMIME("text/x-lua", "lua"); Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/php/index.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/php/index.html (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/php/index.html 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,49 @@ +<!doctype html> +<html> + <head> + <title>CodeMirror 2: PHP mode</title> + <link rel="stylesheet" href="../../lib/codemirror.css"> + <script src="../../lib/codemirror.js"></script> + <script src="../xml/xml.js"></script> + <script src="../javascript/javascript.js"></script> + <script src="../css/css.js"></script> + <script src="../clike/clike.js"></script> + <script src="php.js"></script> + <link rel="stylesheet" href="../../theme/default.css"> + <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style> + <link rel="stylesheet" href="../../css/docs.css"> + </head> + <body> + <h1>CodeMirror 2: PHP mode</h1> + +<form><textarea id="code" name="code"> +<?php +function hello($who) { + return "Hello " . $who; +} +?> +<p>The program says <?= hello("World") ?>.</p> +<script> + alert("And here is some JS code"); // also colored +</script> +</textarea></form> + + <script> + var editor = CodeMirror.fromTextArea(document.getElementById("code"), { + lineNumbers: true, + matchBrackets: true, + mode: "application/x-httpd-php", + indentUnit: 8, + indentWithTabs: true, + enterMode: "keep", + tabMode: "shift" + }); + </script> + + <p>Simple HTML/PHP mode based on + the <a href="../clike/">C-like</a> mode. Depends on XML, + JavaScript, CSS, and C-like modes.</p> + + <p><strong>MIME types defined:</strong> <code>application/x-httpd-php</code> (HTML with PHP code), <code>text/x-php</code> (plain, non-wrapped PHP code).</p> + </body> +</html> Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/php/php.js =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/php/php.js (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/php/php.js 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,84 @@ +(function() { + function keywords(str) { + var obj = {}, words = str.split(" "); + for (var i = 0; i < words.length; ++i) obj[words[i]] = true; + return obj; + } + var phpKeywords = + keywords("abstract and array as break case catch cfunction class clone const continue declare " + + "default do else elseif enddeclare endfor endforeach endif endswitch endwhile extends " + + "final for foreach function global goto if implements interface instanceof namespace " + + "new or private protected public static switch throw try use var while xor"); + var phpConfig = {name: "clike", keywords: phpKeywords, multiLineStrings: true, $vars: true}; + + CodeMirror.defineMode("php", function(config, parserConfig) { + var htmlMode = CodeMirror.getMode(config, "text/html"); + var jsMode = CodeMirror.getMode(config, "text/javascript"); + var cssMode = CodeMirror.getMode(config, "text/css"); + var phpMode = CodeMirror.getMode(config, phpConfig); + + function dispatch(stream, state) { // TODO open PHP inside text/css + if (state.curMode == htmlMode) { + var style = htmlMode.token(stream, state.curState); + if (style == "meta" && /^<\?/.test(stream.current())) { + state.curMode = phpMode; + state.curState = state.php; + state.curClose = /^\?>/; + } + else if (style == "tag" && stream.current() == ">" && state.curState.context) { + if (/^script$/i.test(state.curState.context.tagName)) { + state.curMode = jsMode; + state.curState = jsMode.startState(htmlMode.indent(state.curState, "")); + state.curClose = /^<\/\s*script\s*>/i; + } + else if (/^style$/i.test(state.curState.context.tagName)) { + state.curMode = cssMode; + state.curState = cssMode.startState(htmlMode.indent(state.curState, "")); + state.curClose = /^<\/\s*style\s*>/i; + } + } + return style; + } + else if (stream.match(state.curClose, false)) { + state.curMode = htmlMode; + state.curState = state.html; + state.curClose = null; + return dispatch(stream, state); + } + else return state.curMode.token(stream, state.curState); + } + + return { + startState: function() { + var html = htmlMode.startState(); + return {html: html, + php: phpMode.startState(), + curMode: htmlMode, + curState: html, + curClose: null} + }, + + copyState: function(state) { + var html = state.html, htmlNew = CodeMirror.copyState(htmlMode, html), + php = state.php, phpNew = CodeMirror.copyState(phpMode, php), cur; + if (state.curState == html) cur = htmlNew; + else if (state.curState == php) cur = phpNew; + else cur = CodeMirror.copyState(state.curMode, state.curState); + return {html: htmlNew, php: phpNew, curMode: state.curMode, curState: cur, curClose: state.curClose}; + }, + + token: dispatch, + + indent: function(state, textAfter) { + if ((state.curMode != phpMode && /^\s*<\//.test(textAfter)) || + (state.curMode == phpMode && /^\?>/.test(textAfter))) + return htmlMode.indent(state.html, textAfter); + return state.curMode.indent(state.curState, textAfter); + }, + + electricChars: "/{}:" + } + }); + CodeMirror.defineMIME("application/x-httpd-php", "php"); + CodeMirror.defineMIME("text/x-php", phpConfig); +})(); Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/plsql/index.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/plsql/index.html (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/plsql/index.html 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,63 @@ +<!doctype html> +<html> + <head> + <title>CodeMirror 2: Oracle PL/SQL mode</title> + <link rel="stylesheet" href="../../lib/codemirror.css"> + <script src="../../lib/codemirror.js"></script> + <script src="plsql.js"></script> + <link rel="stylesheet" href="../../theme/default.css"> + <link rel="stylesheet" href="../../css/docs.css"> + <style>.CodeMirror {border: 2px inset #dee;}</style> + </head> + <body> + <h1>CodeMirror 2: Oracle PL/SQL mode</h1> + +<form><textarea id="code" name="code"> +-- Oracle PL/SQL Code Demo +/* + based on c-like mode, adapted to PL/SQL by Peter Raganitsch ( http://www.oracle-and-apex.com/ ) + April 2011 +*/ +DECLARE + vIdx NUMBER; + vString VARCHAR2(100); + cText CONSTANT VARCHAR2(100) := 'That''s it! Have fun with CodeMirror 2'; +BEGIN + vIdx := 0; + -- + FOR rDATA IN + ( SELECT * + FROM EMP + ORDER BY EMPNO + ) + LOOP + vIdx := vIdx + 1; + vString := rDATA.EMPNO || ' - ' || rDATA.ENAME; + -- + UPDATE EMP + SET SAL = SAL * 101/100 + WHERE EMPNO = rDATA.EMPNO + ; + END LOOP; + -- + SYS.DBMS_OUTPUT.Put_Line (cText); +END; +-- +</textarea></form> + + <script> + var editor = CodeMirror.fromTextArea(document.getElementById("code"), { + lineNumbers: true, + matchBrackets: true, + indentUnit: 4, + mode: "text/x-plsql" + }); + </script> + + <p> + Simple mode that handles Oracle PL/SQL language (and Oracle SQL, of course). + </p> + + <p><strong>MIME type defined:</strong> <code>text/x-plsql</code> + (PLSQL code) +</html> Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/plsql/plsql.js =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/plsql/plsql.js (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/plsql/plsql.js 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,217 @@ +CodeMirror.defineMode("plsql", function(config, parserConfig) { + var indentUnit = config.indentUnit, + keywords = parserConfig.keywords, + functions = parserConfig.functions, + types = parserConfig.types, + sqlplus = parserConfig.sqlplus, + multiLineStrings = parserConfig.multiLineStrings; + var isOperatorChar = /[+\-*&%=<>!?:\/|]/; + function chain(stream, state, f) { + state.tokenize = f; + return f(stream, state); + } + + var type; + function ret(tp, style) { + type = tp; + return style; + } + + function tokenBase(stream, state) { + var ch = stream.next(); + // start of string? + if (ch == '"' || ch == "'") + return chain(stream, state, tokenString(ch)); + // is it one of the special signs []{}().,;? Seperator? + else if (/[\[\]{},;\.]/.test(ch)) + return ret(ch); + // start of a number value? + else if (/\d/.test(ch)) { + stream.eatWhile(/[\w\.]/) + return ret("number", "number"); + } + // multi line comment or simple operator? + else if (ch == "/") { + if (stream.eat("*")) { + return chain(stream, state, tokenComment); + } + else { + stream.eatWhile(isOperatorChar); + return ret("operator", "operator"); + } + } + // single line comment or simple operator? + else if (ch == "-") { + if (stream.eat("-")) { + stream.skipToEnd(); + return ret("comment", "comment"); + } + else { + stream.eatWhile(isOperatorChar); + return ret("operator", "operator"); + } + } + // pl/sql variable? + else if (ch == "@" || ch == "$") { + stream.eatWhile(/[\w\d\$_]/); + return ret("word", "variable"); + } + // is it a operator? + else if (isOperatorChar.test(ch)) { + stream.eatWhile(isOperatorChar); + return ret("operator", "operator"); + } + else { + // get the whole word + stream.eatWhile(/[\w\$_]/); + // is it one of the listed keywords? + if (keywords && keywords.propertyIsEnumerable(stream.current().toLowerCase())) return ret("keyword", "keyword"); + // is it one of the listed functions? + if (functions && functions.propertyIsEnumerable(stream.current().toLowerCase())) return ret("keyword", "builtin"); + // is it one of the listed types? + if (types && types.propertyIsEnumerable(stream.current().toLowerCase())) return ret("keyword", "variable-2"); + // is it one of the listed sqlplus keywords? + if (sqlplus && sqlplus.propertyIsEnumerable(stream.current().toLowerCase())) return ret("keyword", "variable-3"); + // default: just a "word" + return ret("word", "plsql-word"); + } + } + + function tokenString(quote) { + return function(stream, state) { + var escaped = false, next, end = false; + while ((next = stream.next()) != null) { + if (next == quote && !escaped) {end = true; break;} + escaped = !escaped && next == "\\"; + } + if (end || !(escaped || multiLineStrings)) + state.tokenize = tokenBase; + return ret("string", "plsql-string"); + }; + } + + function tokenComment(stream, state) { + var maybeEnd = false, ch; + while (ch = stream.next()) { + if (ch == "/" && maybeEnd) { + state.tokenize = tokenBase; + break; + } + maybeEnd = (ch == "*"); + } + return ret("comment", "plsql-comment"); + } + + // Interface + + return { + startState: function(basecolumn) { + return { + tokenize: tokenBase, + startOfLine: true + }; + }, + + token: function(stream, state) { + if (stream.eatSpace()) return null; + var style = state.tokenize(stream, state); + return style; + } + }; +}); + +(function() { + function keywords(str) { + var obj = {}, words = str.split(" "); + for (var i = 0; i < words.length; ++i) obj[words[i]] = true; + return obj; + } + var cKeywords = "abort accept access add all alter and any array arraylen as asc assert assign at attributes audit " + + "authorization avg " + + "base_table begin between binary_integer body boolean by " + + "case cast char char_base check close cluster clusters colauth column comment commit compress connect " + + "connected constant constraint crash create current currval cursor " + + "data_base database date dba deallocate debugoff debugon decimal declare default definition delay delete " + + "desc digits dispose distinct do drop " + + "else elsif enable end entry escape exception exception_init exchange exclusive exists exit external " + + "fast fetch file for force form from function " + + "generic goto grant group " + + "having " + + "identified if immediate in increment index indexes indicator initial initrans insert interface intersect " + + "into is " + + "key " + + "level library like limited local lock log logging long loop " + + "master maxextents maxtrans member minextents minus mislabel mode modify multiset " + + "new next no noaudit nocompress nologging noparallel not nowait number_base " + + "object of off offline on online only open option or order out " + + "package parallel partition pctfree pctincrease pctused pls_integer positive positiven pragma primary prior " + + "private privileges procedure public " + + "raise range raw read rebuild record ref references refresh release rename replace resource restrict return " + + "returning reverse revoke rollback row rowid rowlabel rownum rows run " + + "savepoint schema segment select separate session set share snapshot some space split sql start statement " + + "storage subtype successful synonym " + + "tabauth table tables tablespace task terminate then to trigger truncate type " + + "union unique unlimited unrecoverable unusable update use using " + + "validate value values variable view views " + + "when whenever where while with work"; + + var cFunctions = "abs acos add_months ascii asin atan atan2 average " + + "bfilename " + + "ceil chartorowid chr concat convert cos cosh count " + + "decode deref dual dump dup_val_on_index " + + "empty error exp " + + "false floor found " + + "glb greatest " + + "hextoraw " + + "initcap instr instrb isopen " + + "last_day least lenght lenghtb ln lower lpad ltrim lub " + + "make_ref max min mod months_between " + + "new_time next_day nextval nls_charset_decl_len nls_charset_id nls_charset_name nls_initcap nls_lower " + + "nls_sort nls_upper nlssort no_data_found notfound null nvl " + + "others " + + "power " + + "rawtohex reftohex round rowcount rowidtochar rpad rtrim " + + "sign sin sinh soundex sqlcode sqlerrm sqrt stddev substr substrb sum sysdate " + + "tan tanh to_char to_date to_label to_multi_byte to_number to_single_byte translate true trunc " + + "uid upper user userenv " + + "variance vsize"; + + var cTypes = "bfile blob " + + "character clob " + + "dec " + + "float " + + "int integer " + + "mlslabel " + + "natural naturaln nchar nclob number numeric nvarchar2 " + + "real rowtype " + + "signtype smallint string " + + "varchar varchar2"; + + var cSqlplus = "appinfo arraysize autocommit autoprint autorecovery autotrace " + + "blockterminator break btitle " + + "cmdsep colsep compatibility compute concat copycommit copytypecheck " + + "define describe " + + "echo editfile embedded escape exec execute " + + "feedback flagger flush " + + "heading headsep " + + "instance " + + "linesize lno loboffset logsource long longchunksize " + + "markup " + + "native newpage numformat numwidth " + + "pagesize pause pno " + + "recsep recsepchar release repfooter repheader " + + "serveroutput shiftinout show showmode size spool sqlblanklines sqlcase sqlcode sqlcontinue sqlnumber " + + "sqlpluscompatibility sqlprefix sqlprompt sqlterminator suffix " + + "tab term termout time timing trimout trimspool ttitle " + + "underline " + + "verify version " + + "wrap"; + + CodeMirror.defineMIME("text/x-plsql", { + name: "plsql", + keywords: keywords(cKeywords), + functions: keywords(cFunctions), + types: keywords(cTypes), + sqlplus: keywords(cSqlplus) + }); +}()); Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/python/LICENSE.txt =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/python/LICENSE.txt (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/python/LICENSE.txt 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,21 @@ +The MIT License + +Copyright (c) 2010 Timothy Farrell + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. \ No newline at end of file Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/python/index.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/python/index.html (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/python/index.html 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,123 @@ +<!doctype html> +<html> + <head> + <title>CodeMirror 2: Python mode</title> + <link rel="stylesheet" href="../../lib/codemirror.css"> + <script src="../../lib/codemirror.js"></script> + <script src="python.js"></script> + <link rel="stylesheet" href="../../theme/default.css"> + <link rel="stylesheet" href="../../css/docs.css"> + <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style> + </head> + <body> + <h1>CodeMirror 2: Python mode</h1> + + <div><textarea id="code" name="code"> +# Literals +1234 +0.0e101 +.123 +0b01010011100 +0o01234567 +0x0987654321abcdef +7 +2147483647 +3L +79228162514264337593543950336L +0x100000000L +79228162514264337593543950336 +0xdeadbeef +3.14j +10.j +10j +.001j +1e100j +3.14e-10j + + +# String Literals +'For\'' +"God\"" +"""so loved +the world""" +'''that he gave +his only begotten\' ''' +'that whosoever believeth \ +in him' +'' + +# Identifiers +__a__ +a.b +a.b.c + +# Operators ++ - * / % & | ^ ~ < > +== != <= >= <> << >> // ** +and or not in is + +# Delimiters +() [] {} , : ` = ; @ . # Note that @ and . require the proper context. ++= -= *= /= %= &= |= ^= +//= >>= <<= **= + +# Keywords +as assert break class continue def del elif else except +finally for from global if import lambda pass raise +return try while with yield + +# Python 2 Keywords (otherwise Identifiers) +exec print + +# Python 3 Keywords (otherwise Identifiers) +nonlocal + +# Types +bool classmethod complex dict enumerate float frozenset int list object +property reversed set slice staticmethod str super tuple type + +# Python 2 Types (otherwise Identifiers) +basestring buffer file long unicode xrange + +# Python 3 Types (otherwise Identifiers) +bytearray bytes filter map memoryview open range zip + +# Some Example code +import os +from package import ParentClass + +@nonsenseDecorator +def doesNothing(): + pass + +class ExampleClass(ParentClass): + @staticmethod + def example(inputStr): + a = list(inputStr) + a.reverse() + return ''.join(a) + + def __init__(self, mixin = 'Hello'): + self.mixin = mixin + +</textarea></div> + <script> + var editor = CodeMirror.fromTextArea(document.getElementById("code"), { + mode: {name: "python", + version: 2, + singleLineStringErrors: false}, + lineNumbers: true, + indentUnit: 4, + tabMode: "shift", + matchBrackets: true + }); + </script> + <h2>Configuration Options:</h2> + <ul> + <li>version - 2/3 - The version of Python to recognize. Default is 2.</li> + <li>singleLineStringErrors - true/false - If you have a single-line string that is not terminated at the end of the line, this will show subsequent lines as errors if true, otherwise it will consider the newline as the end of the string. Default is false.</li> + </ul> + + <p><strong>MIME types defined:</strong> <code>text/x-python</code>.</p> + </body> +</html> Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/python/python.js =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/python/python.js (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/python/python.js 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,321 @@ +CodeMirror.defineMode("python", function(conf) { + var ERRORCLASS = 'error'; + + function wordRegexp(words) { + return new RegExp("^((" + words.join(")|(") + "))\\b"); + } + + var singleOperators = new RegExp("^[\\+\\-\\*/%&|\\^~<>!]"); + var singleDelimiters = new RegExp('^[\$\$\\[\\]\\{\\}@,:`=;\\.]'); + var doubleOperators = new RegExp("^((==)|(!=)|(<=)|(>=)|(<>)|(<<)|(>>)|(//)|(\\*\\*))"); + var doubleDelimiters = new RegExp("^((\\+=)|(\\-=)|(\\*=)|(%=)|(/=)|(&=)|(\\|=)|(\\^=))"); + var tripleDelimiters = new RegExp("^((//=)|(>>=)|(<<=)|(\\*\\*=))"); + var identifiers = new RegExp("^[_A-Za-z][_A-Za-z0-9]*"); + + var wordOperators = wordRegexp(['and', 'or', 'not', 'is', 'in']); + var commonkeywords = ['as', 'assert', 'break', 'class', 'continue', + 'def', 'del', 'elif', 'else', 'except', 'finally', + 'for', 'from', 'global', 'if', 'import', + 'lambda', 'pass', 'raise', 'return', + 'try', 'while', 'with', 'yield']; + var commontypes = ['bool', 'classmethod', 'complex', 'dict', 'enumerate', + 'float', 'frozenset', 'int', 'list', 'object', + 'property', 'reversed', 'set', 'slice', 'staticmethod', + 'str', 'super', 'tuple', 'type']; + var py2 = {'types': ['basestring', 'buffer', 'file', 'long', 'unicode', + 'xrange'], + 'keywords': ['exec', 'print']}; + var py3 = {'types': ['bytearray', 'bytes', 'filter', 'map', 'memoryview', + 'open', 'range', 'zip'], + 'keywords': ['nonlocal']}; + + if (!!conf.mode.version && parseInt(conf.mode.version, 10) === 3) { + commonkeywords = commonkeywords.concat(py3.keywords); + commontypes = commontypes.concat(py3.types); + var stringPrefixes = new RegExp("^(([rb]|(br))?('{3}|\"{3}|['\"]))", "i"); + } else { + commonkeywords = commonkeywords.concat(py2.keywords); + commontypes = commontypes.concat(py2.types); + var stringPrefixes = new RegExp("^(([rub]|(ur)|(br))?('{3}|\"{3}|['\"]))", "i"); + } + var keywords = wordRegexp(commonkeywords); + var types = wordRegexp(commontypes); + + var indentInfo = null; + + // tokenizers + function tokenBase(stream, state) { + // Handle scope changes + if (stream.sol()) { + var scopeOffset = state.scopes[0].offset; + if (stream.eatSpace()) { + var lineOffset = stream.indentation(); + if (lineOffset > scopeOffset) { + indentInfo = 'indent'; + } else if (lineOffset < scopeOffset) { + indentInfo = 'dedent'; + } + return null; + } else { + if (scopeOffset > 0) { + dedent(stream, state); + } + } + } + if (stream.eatSpace()) { + return null; + } + + var ch = stream.peek(); + + // Handle Comments + if (ch === '#') { + stream.skipToEnd(); + return 'comment'; + } + + // Handle Number Literals + if (stream.match(/^[0-9\.]/, false)) { + var floatLiteral = false; + // Floats + if (stream.match(/^\d*\.\d+(e[\+\-]?\d+)?/i)) { floatLiteral = true; } + if (stream.match(/^\d+\.\d*/)) { floatLiteral = true; } + if (stream.match(/^\.\d+/)) { floatLiteral = true; } + if (floatLiteral) { + // Float literals may be "imaginary" + stream.eat(/J/i); + return 'number'; + } + // Integers + var intLiteral = false; + // Hex + if (stream.match(/^0x[0-9a-f]+/i)) { intLiteral = true; } + // Binary + if (stream.match(/^0b[01]+/i)) { intLiteral = true; } + // Octal + if (stream.match(/^0o[0-7]+/i)) { intLiteral = true; } + // Decimal + if (stream.match(/^[1-9]\d*(e[\+\-]?\d+)?/)) { + // Decimal literals may be "imaginary" + stream.eat(/J/i); + // TODO - Can you have imaginary longs? + intLiteral = true; + } + // Zero by itself with no other piece of number. + if (stream.match(/^0(?![\dx])/i)) { intLiteral = true; } + if (intLiteral) { + // Integer literals may be "long" + stream.eat(/L/i); + return 'number'; + } + } + + // Handle Strings + if (stream.match(stringPrefixes)) { + state.tokenize = tokenStringFactory(stream.current()); + return state.tokenize(stream, state); + } + + // Handle operators and Delimiters + if (stream.match(tripleDelimiters) || stream.match(doubleDelimiters)) { + return null; + } + if (stream.match(doubleOperators) + || stream.match(singleOperators) + || stream.match(wordOperators)) { + return 'operator'; + } + if (stream.match(singleDelimiters)) { + return null; + } + + if (stream.match(types)) { + return 'builtin'; + } + + if (stream.match(keywords)) { + return 'keyword'; + } + + if (stream.match(identifiers)) { + return 'variable'; + } + + // Handle non-detected items + stream.next(); + return ERRORCLASS; + } + + function tokenStringFactory(delimiter) { + while ('rub'.indexOf(delimiter[0].toLowerCase()) >= 0) { + delimiter = delimiter.substr(1); + } + var delim_re = new RegExp(delimiter); + var singleline = delimiter.length == 1; + var OUTCLASS = 'string'; + + return function tokenString(stream, state) { + while (!stream.eol()) { + stream.eatWhile(/[^'"\\]/); + if (stream.eat('\\')) { + stream.next(); + if (singleline && stream.eol()) { + return OUTCLASS; + } + } else if (stream.match(delim_re)) { + state.tokenize = tokenBase; + return OUTCLASS; + } else { + stream.eat(/['"]/); + } + } + if (singleline) { + if (conf.mode.singleLineStringErrors) { + OUTCLASS = ERRORCLASS + } else { + state.tokenize = tokenBase; + } + } + return OUTCLASS; + }; + } + + function indent(stream, state, type) { + type = type || 'py'; + var indentUnit = 0; + if (type === 'py') { + for (var i = 0; i < state.scopes.length; ++i) { + if (state.scopes[i].type === 'py') { + indentUnit = state.scopes[i].offset + conf.indentUnit; + break; + } + } + } else { + indentUnit = stream.column() + stream.current().length; + } + state.scopes.unshift({ + offset: indentUnit, + type: type + }); + } + + function dedent(stream, state) { + if (state.scopes.length == 1) return; + if (state.scopes[0].type === 'py') { + var _indent = stream.indentation(); + var _indent_index = -1; + for (var i = 0; i < state.scopes.length; ++i) { + if (_indent === state.scopes[i].offset) { + _indent_index = i; + break; + } + } + if (_indent_index === -1) { + return true; + } + while (state.scopes[0].offset !== _indent) { + state.scopes.shift(); + } + return false + } else { + state.scopes.shift(); + return false; + } + } + + function tokenLexer(stream, state) { + indentInfo = null; + var style = state.tokenize(stream, state); + var current = stream.current(); + + // Handle '.' connected identifiers + if (current === '.') { + style = state.tokenize(stream, state); + current = stream.current(); + if (style === 'variable') { + return 'variable'; + } else { + return ERRORCLASS; + } + } + + // Handle decorators + if (current === '@') { + style = state.tokenize(stream, state); + current = stream.current(); + if (style === 'variable' + || current === '@staticmethod' + || current === '@classmethod') { + return 'meta'; + } else { + return ERRORCLASS; + } + } + + // Handle scope changes. + if (current === 'pass' || current === 'return') { + state.dedent += 1; + } + if ((current === ':' && !state.lambda && state.scopes[0].type == 'py') + || indentInfo === 'indent') { + indent(stream, state); + } + var delimiter_index = '[({'.indexOf(current); + if (delimiter_index !== -1) { + indent(stream, state, '])}'.slice(delimiter_index, delimiter_index+1)); + } + if (indentInfo === 'dedent') { + if (dedent(stream, state)) { + return ERRORCLASS; + } + } + delimiter_index = '])}'.indexOf(current); + if (delimiter_index !== -1) { + if (dedent(stream, state)) { + return ERRORCLASS; + } + } + if (state.dedent > 0 && stream.eol() && state.scopes[0].type == 'py') { + if (state.scopes.length > 1) state.scopes.shift(); + state.dedent -= 1; + } + + return style; + } + + var external = { + startState: function(basecolumn) { + return { + tokenize: tokenBase, + scopes: [{offset:basecolumn || 0, type:'py'}], + lastToken: null, + lambda: false, + dedent: 0 + }; + }, + + token: function(stream, state) { + var style = tokenLexer(stream, state); + + state.lastToken = {style:style, content: stream.current()}; + + if (stream.eol() && stream.lambda) { + state.lambda = false; + } + + return style; + }, + + indent: function(state, textAfter) { + if (state.tokenize != tokenBase) { + return 0; + } + + return state.scopes[0].offset; + } + + }; + return external; +}); + +CodeMirror.defineMIME("text/x-python", "python"); Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/rst/index.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/rst/index.html (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/rst/index.html 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,526 @@ +<!doctype html> +<html> + <head> + <title>CodeMirror 2: reStructuredText mode</title> + <link rel="stylesheet" href="../../lib/codemirror.css"> + <script src="../../lib/codemirror.js"></script> + <script src="rst.js"></script> + <link rel="stylesheet" href="rst.css"> + <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style> + <link rel="stylesheet" href="../../css/docs.css"> + </head> + <body> + <h1>CodeMirror 2: reStructuredText mode</h1> + +<form><textarea id="code" name="code"> +.. This is an excerpt from Sphinx documentation: http://sphinx.pocoo.org/_sources/rest.txt + +.. highlightlang:: rest + +.. _rst-primer: + +reStructuredText Primer +======================= + +This section is a brief introduction to reStructuredText (reST) concepts and +syntax, intended to provide authors with enough information to author documents +productively. Since reST was designed to be a simple, unobtrusive markup +language, this will not take too long. + +.. seealso:: + + The authoritative `reStructuredText User Documentation + <http://docutils.sourceforge.net/rst.html>`_. The "ref" links in this + document link to the description of the individual constructs in the reST + reference. + + +Paragraphs +---------- + +The paragraph (:duref:`ref <paragraphs>`) is the most basic block in a reST +document. Paragraphs are simply chunks of text separated by one or more blank +lines. As in Python, indentation is significant in reST, so all lines of the +same paragraph must be left-aligned to the same level of indentation. + + +.. _inlinemarkup: + +Inline markup +------------- + +The standard reST inline markup is quite simple: use + +* one asterisk: ``*text*`` for emphasis (italics), +* two asterisks: ``**text**`` for strong emphasis (boldface), and +* backquotes: ````text```` for code samples. + +If asterisks or backquotes appear in running text and could be confused with +inline markup delimiters, they have to be escaped with a backslash. + +Be aware of some restrictions of this markup: + +* it may not be nested, +* content may not start or end with whitespace: ``* text*`` is wrong, +* it must be separated from surrounding text by non-word characters. Use a + backslash escaped space to work around that: ``thisis\ *one*\ word``. + +These restrictions may be lifted in future versions of the docutils. + +reST also allows for custom "interpreted text roles"', which signify that the +enclosed text should be interpreted in a specific way. Sphinx uses this to +provide semantic markup and cross-referencing of identifiers, as described in +the appropriate section. The general syntax is ``:rolename:`content```. + +Standard reST provides the following roles: + +* :durole:`emphasis` -- alternate spelling for ``*emphasis*`` +* :durole:`strong` -- alternate spelling for ``**strong**`` +* :durole:`literal` -- alternate spelling for ````literal```` +* :durole:`subscript` -- subscript text +* :durole:`superscript` -- superscript text +* :durole:`title-reference` -- for titles of books, periodicals, and other + materials + +See :ref:`inline-markup` for roles added by Sphinx. + + +Lists and Quote-like blocks +--------------------------- + +List markup (:duref:`ref <bullet-lists>`) is natural: just place an asterisk at +the start of a paragraph and indent properly. The same goes for numbered lists; +they can also be autonumbered using a ``#`` sign:: + + * This is a bulleted list. + * It has two items, the second + item uses two lines. + + 1. This is a numbered list. + 2. It has two items too. + + #. This is a numbered list. + #. It has two items too. + + +Nested lists are possible, but be aware that they must be separated from the +parent list items by blank lines:: + + * this is + * a list + + * with a nested list + * and some subitems + + * and here the parent list continues + +Definition lists (:duref:`ref <definition-lists>`) are created as follows:: + + term (up to a line of text) + Definition of the term, which must be indented + + and can even consist of multiple paragraphs + + next term + Description. + +Note that the term cannot have more than one line of text. + +Quoted paragraphs (:duref:`ref <block-quotes>`) are created by just indenting +them more than the surrounding paragraphs. + +Line blocks (:duref:`ref <line-blocks>`) are a way of preserving line breaks:: + + | These lines are + | broken exactly like in + | the source file. + +There are also several more special blocks available: + +* field lists (:duref:`ref <field-lists>`) +* option lists (:duref:`ref <option-lists>`) +* quoted literal blocks (:duref:`ref <quoted-literal-blocks>`) +* doctest blocks (:duref:`ref <doctest-blocks>`) + + +Source Code +----------- + +Literal code blocks (:duref:`ref <literal-blocks>`) are introduced by ending a +paragraph with the special marker ``::``. The literal block must be indented +(and, like all paragraphs, separated from the surrounding ones by blank lines):: + + This is a normal text paragraph. The next paragraph is a code sample:: + + It is not processed in any way, except + that the indentation is removed. + + It can span multiple lines. + + This is a normal text paragraph again. + +The handling of the ``::`` marker is smart: + +* If it occurs as a paragraph of its own, that paragraph is completely left + out of the document. +* If it is preceded by whitespace, the marker is removed. +* If it is preceded by non-whitespace, the marker is replaced by a single + colon. + +That way, the second sentence in the above example's first paragraph would be +rendered as "The next paragraph is a code sample:". + + +.. _rst-tables: + +Tables +------ + +Two forms of tables are supported. For *grid tables* (:duref:`ref +<grid-tables>`), you have to "paint" the cell grid yourself. They look like +this:: + + +------------------------+------------+----------+----------+ + | Header row, column 1 | Header 2 | Header 3 | Header 4 | + | (header rows optional) | | | | + +========================+============+==========+==========+ + | body row 1, column 1 | column 2 | column 3 | column 4 | + +------------------------+------------+----------+----------+ + | body row 2 | ... | ... | | + +------------------------+------------+----------+----------+ + +*Simple tables* (:duref:`ref <simple-tables>`) are easier to write, but +limited: they must contain more than one row, and the first column cannot +contain multiple lines. They look like this:: + + ===== ===== ======= + A B A and B + ===== ===== ======= + False False False + True False False + False True False + True True True + ===== ===== ======= + + +Hyperlinks +---------- + +External links +^^^^^^^^^^^^^^ + +Use ```Link text <http://example.com/>`_`` for inline web links. If the link +text should be the web address, you don't need special markup at all, the parser +finds links and mail addresses in ordinary text. + +You can also separate the link and the target definition (:duref:`ref +<hyperlink-targets>`), like this:: + + This is a paragraph that contains `a link`_. + + .. _a link: http://example.com/ + + +Internal links +^^^^^^^^^^^^^^ + +Internal linking is done via a special reST role provided by Sphinx, see the +section on specific markup, :ref:`ref-role`. + + +Sections +-------- + +Section headers (:duref:`ref <sections>`) are created by underlining (and +optionally overlining) the section title with a punctuation character, at least +as long as the text:: + + ================= + This is a heading + ================= + +Normally, there are no heading levels assigned to certain characters as the +structure is determined from the succession of headings. However, for the +Python documentation, this convention is used which you may follow: + +* ``#`` with overline, for parts +* ``*`` with overline, for chapters +* ``=``, for sections +* ``-``, for subsections +* ``^``, for subsubsections +* ``"``, for paragraphs + +Of course, you are free to use your own marker characters (see the reST +documentation), and use a deeper nesting level, but keep in mind that most +target formats (HTML, LaTeX) have a limited supported nesting depth. + + +Explicit Markup +--------------- + +"Explicit markup" (:duref:`ref <explicit-markup-blocks>`) is used in reST for +most constructs that need special handling, such as footnotes, +specially-highlighted paragraphs, comments, and generic directives. + +An explicit markup block begins with a line starting with ``..`` followed by +whitespace and is terminated by the next paragraph at the same level of +indentation. (There needs to be a blank line between explicit markup and normal +paragraphs. This may all sound a bit complicated, but it is intuitive enough +when you write it.) + + +.. _directives: + +Directives +---------- + +A directive (:duref:`ref <directives>`) is a generic block of explicit markup. +Besides roles, it is one of the extension mechanisms of reST, and Sphinx makes +heavy use of it. + +Docutils supports the following directives: + +* Admonitions: :dudir:`attention`, :dudir:`caution`, :dudir:`danger`, + :dudir:`error`, :dudir:`hint`, :dudir:`important`, :dudir:`note`, + :dudir:`tip`, :dudir:`warning` and the generic :dudir:`admonition`. + (Most themes style only "note" and "warning" specially.) + +* Images: + + - :dudir:`image` (see also Images_ below) + - :dudir:`figure` (an image with caption and optional legend) + +* Additional body elements: + + - :dudir:`contents` (a local, i.e. for the current file only, table of + contents) + - :dudir:`container` (a container with a custom class, useful to generate an + outer ``<div>`` in HTML) + - :dudir:`rubric` (a heading without relation to the document sectioning) + - :dudir:`topic`, :dudir:`sidebar` (special highlighted body elements) + - :dudir:`parsed-literal` (literal block that supports inline markup) + - :dudir:`epigraph` (a block quote with optional attribution line) + - :dudir:`highlights`, :dudir:`pull-quote` (block quotes with their own + class attribute) + - :dudir:`compound` (a compound paragraph) + +* Special tables: + + - :dudir:`table` (a table with title) + - :dudir:`csv-table` (a table generated from comma-separated values) + - :dudir:`list-table` (a table generated from a list of lists) + +* Special directives: + + - :dudir:`raw` (include raw target-format markup) + - :dudir:`include` (include reStructuredText from another file) + -- in Sphinx, when given an absolute include file path, this directive takes + it as relative to the source directory + - :dudir:`class` (assign a class attribute to the next element) [1]_ + +* HTML specifics: + + - :dudir:`meta` (generation of HTML ``<meta>`` tags) + - :dudir:`title` (override document title) + +* Influencing markup: + + - :dudir:`default-role` (set a new default role) + - :dudir:`role` (create a new role) + + Since these are only per-file, better use Sphinx' facilities for setting the + :confval:`default_role`. + +Do *not* use the directives :dudir:`sectnum`, :dudir:`header` and +:dudir:`footer`. + +Directives added by Sphinx are described in :ref:`sphinxmarkup`. + +Basically, a directive consists of a name, arguments, options and content. (Keep +this terminology in mind, it is used in the next chapter describing custom +directives.) Looking at this example, :: + + .. function:: foo(x) + foo(y, z) + :module: some.module.name + + Return a line of text input from the user. + +``function`` is the directive name. It is given two arguments here, the +remainder of the first line and the second line, as well as one option +``module`` (as you can see, options are given in the lines immediately following +the arguments and indicated by the colons). Options must be indented to the +same level as the directive content. + +The directive content follows after a blank line and is indented relative to the +directive start. + + +Images +------ + +reST supports an image directive (:dudir:`ref <image>`), used like so:: + + .. image:: gnu.png + (options) + +When used within Sphinx, the file name given (here ``gnu.png``) must either be +relative to the source file, or absolute which means that they are relative to +the top source directory. For example, the file ``sketch/spam.rst`` could refer +to the image ``images/spam.png`` as ``../images/spam.png`` or +``/images/spam.png``. + +Sphinx will automatically copy image files over to a subdirectory of the output +directory on building (e.g. the ``_static`` directory for HTML output.) + +Interpretation of image size options (``width`` and ``height``) is as follows: +if the size has no unit or the unit is pixels, the given size will only be +respected for output channels that support pixels (i.e. not in LaTeX output). +Other units (like ``pt`` for points) will be used for HTML and LaTeX output. + +Sphinx extends the standard docutils behavior by allowing an asterisk for the +extension:: + + .. image:: gnu.* + +Sphinx then searches for all images matching the provided pattern and determines +their type. Each builder then chooses the best image out of these candidates. +For instance, if the file name ``gnu.*`` was given and two files :file:`gnu.pdf` +and :file:`gnu.png` existed in the source tree, the LaTeX builder would choose +the former, while the HTML builder would prefer the latter. + +.. versionchanged:: 0.4 + Added the support for file names ending in an asterisk. + +.. versionchanged:: 0.6 + Image paths can now be absolute. + + +Footnotes +--------- + +For footnotes (:duref:`ref <footnotes>`), use ``[#name]_`` to mark the footnote +location, and add the footnote body at the bottom of the document after a +"Footnotes" rubric heading, like so:: + + Lorem ipsum [#f1]_ dolor sit amet ... [#f2]_ + + .. rubric:: Footnotes + + .. [#f1] Text of the first footnote. + .. [#f2] Text of the second footnote. + +You can also explicitly number the footnotes (``[1]_``) or use auto-numbered +footnotes without names (``[#]_``). + + +Citations +--------- + +Standard reST citations (:duref:`ref <citations>`) are supported, with the +additional feature that they are "global", i.e. all citations can be referenced +from all files. Use them like so:: + + Lorem ipsum [Ref]_ dolor sit amet. + + .. [Ref] Book or article reference, URL or whatever. + +Citation usage is similar to footnote usage, but with a label that is not +numeric or begins with ``#``. + + +Substitutions +------------- + +reST supports "substitutions" (:duref:`ref <substitution-definitions>`), which +are pieces of text and/or markup referred to in the text by ``|name|``. They +are defined like footnotes with explicit markup blocks, like this:: + + .. |name| replace:: replacement *text* + +or this:: + + .. |caution| image:: warning.png + :alt: Warning! + +See the :duref:`reST reference for substitutions <substitution-definitions>` +for details. + +If you want to use some substitutions for all documents, put them into +:confval:`rst_prolog` or put them into a separate file and include it into all +documents you want to use them in, using the :rst:dir:`include` directive. (Be +sure to give the include file a file name extension differing from that of other +source files, to avoid Sphinx finding it as a standalone document.) + +Sphinx defines some default substitutions, see :ref:`default-substitutions`. + + +Comments +-------- + +Every explicit markup block which isn't a valid markup construct (like the +footnotes above) is regarded as a comment (:duref:`ref <comments>`). For +example:: + + .. This is a comment. + +You can indent text after a comment start to form multiline comments:: + + .. + This whole indented block + is a comment. + + Still in the comment. + + +Source encoding +--------------- + +Since the easiest way to include special characters like em dashes or copyright +signs in reST is to directly write them as Unicode characters, one has to +specify an encoding. Sphinx assumes source files to be encoded in UTF-8 by +default; you can change this with the :confval:`source_encoding` config value. + + +Gotchas +------- + +There are some problems one commonly runs into while authoring reST documents: + +* **Separation of inline markup:** As said above, inline markup spans must be + separated from the surrounding text by non-word characters, you have to use a + backslash-escaped space to get around that. See `the reference + <http://docutils.sf.net/docs/ref/rst/restructuredtext.html#inline-markup>`_ + for the details. + +* **No nested inline markup:** Something like ``*see :func:`foo`*`` is not + possible. + + +.. rubric:: Footnotes + +.. [1] When the default domain contains a :rst:dir:`class` directive, this directive + will be shadowed. Therefore, Sphinx re-exports it as :rst:dir:`rst-class`. +</textarea></form> + + <script> + var editor = CodeMirror.fromTextArea(document.getElementById("code"), { + lineNumbers: true, + }); + </script> + <p>The reStructuredText mode supports one configuration parameter:</p> + <dl> + <dt><code>verbatim (string)</code></dt> + <dd>A name or MIME type of a mode that will be used for highlighting + verbatim blocks. By default, reStructuredText mode uses uniform color + for whole block of verbatim text if no mode is given.</dd> + </dl> + <p>If <code>python</code> mode is available (not a part of CodeMirror 2 yet), + it will be used for highlighting blocks containing Python/IPython terminal + sessions (blocks starting with <code>>>></code> (for Python) or + <code>In [num]:</code> (for IPython). + + <p><strong>MIME types defined:</strong> <code>text/x-rst</code>.</p> + </body> +</html> + Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/rst/rst.css =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/rst/rst.css (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/rst/rst.css 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,75 @@ +.cm-s-default span.cm-emphasis { + font-style: italic; +} + +.cm-s-default span.cm-strong { + font-weight: bold; +} + +.cm-s-default span.cm-interpreted { + color: #33cc66; +} + +.cm-s-default span.cm-inline { + color: #3399cc; +} + +.cm-s-default span.cm-role { + color: #666699; +} + +.cm-s-default span.cm-list { + color: #cc0099; + font-weight: bold; +} + +.cm-s-default span.cm-body { + color: #6699cc; +} + +.cm-s-default span.cm-verbatim { + color: #3366ff; +} + +.cm-s-default span.cm-comment { + color: #aa7700; +} + +.cm-s-default span.cm-directive { + font-weight: bold; + color: #3399ff; +} + +.cm-s-default span.cm-hyperlink { + font-weight: bold; + color: #3366ff; +} + +.cm-s-default span.cm-footnote { + font-weight: bold; + color: #3333ff; +} + +.cm-s-default span.cm-citation { + font-weight: bold; + color: #3300ff; +} + +.cm-s-default span.cm-replacement { + color: #9933cc; +} + +.cm-s-default span.cm-section { + font-weight: bold; + color: #cc0099; +} + +.cm-s-default span.cm-directive-marker { + font-weight: bold; + color: #3399ff; +} + +.cm-s-default span.cm-verbatim-marker { + font-weight: bold; + color: #9900ff; +} Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/rst/rst.js =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/rst/rst.js (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/rst/rst.js 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,333 @@ +CodeMirror.defineMode('rst', function(config, options) { + function setState(state, fn, ctx) { + state.fn = fn; + setCtx(state, ctx); + } + + function setCtx(state, ctx) { + state.ctx = ctx || {}; + } + + function setNormal(state, ch) { + if (ch && (typeof ch !== 'string')) { + var str = ch.current(); + ch = str[str.length-1]; + } + + setState(state, normal, {back: ch}); + } + + function hasMode(mode) { + if (mode) { + var modes = CodeMirror.listModes(); + + for (var i in modes) { + if (modes[i] == mode) { + return true; + } + } + } + + return false; + } + + function getMode(mode) { + if (hasMode(mode)) { + return CodeMirror.getMode(config, mode); + } else { + return null; + } + } + + var verbatimMode = getMode(options.verbatim); + var pythonMode = getMode('python'); + + var reSection = /^[!"#$%&'()*+,-./:;<=>?@[\\\]^_`{|}~]/; + var reDirective = /^\s*\w([-:.\w]*\w)?::(\s|$)/; + var reHyperlink = /^\s*_[\w-]+:(\s|$)/; + var reFootnote = /^\s*\[(\d+|#)\](\s|$)/; + var reCitation = /^\s*\[[A-Za-z][\w-]*\](\s|$)/; + var reFootnoteRef = /^\[(\d+|#)\]_/; + var reCitationRef = /^\[[A-Za-z][\w-]*\]_/; + var reDirectiveMarker = /^\.\.(\s|$)/; + var reVerbatimMarker = /^::\s*$/; + var rePreInline = /^[-\s"([{</:]/; + var rePostInline = /^[-\s`'")\]}>/:.,;!?\\_]/; + var reEnumeratedList = /^\s*((\d+|[A-Za-z#])[.)]|$(\d+|[A-Z-a-z#])$)\s/; + var reBulletedList = /^\s*[-\+\*]\s/; + var reExamples = /^\s+(>>>|In \[\d+\]:)\s/; + + function normal(stream, state) { + var ch, sol, i; + + if (stream.eat(/\\/)) { + ch = stream.next(); + setNormal(state, ch); + return null; + } + + sol = stream.sol(); + + if (sol && (ch = stream.eat(reSection))) { + for (i = 0; stream.eat(ch); i++); + + if (i >= 3 && stream.match(/^\s*$/)) { + setNormal(state, null); + return 'section'; + } else { + stream.backUp(i + 1); + } + } + + if (sol && stream.match(reDirectiveMarker)) { + if (!stream.eol()) { + setState(state, directive); + } + + return 'directive-marker'; + } + + if (stream.match(reVerbatimMarker)) { + if (!verbatimMode) { + setState(state, verbatim); + } else { + var mode = verbatimMode; + + setState(state, verbatim, { + mode: mode, + local: mode.startState() + }); + } + + return 'verbatim-marker'; + } + + if (sol && stream.match(reExamples, false)) { + if (!pythonMode) { + setState(state, verbatim); + return 'verbatim-marker'; + } else { + var mode = pythonMode; + + setState(state, verbatim, { + mode: mode, + local: mode.startState() + }); + + return null; + } + } + + if (sol && (stream.match(reEnumeratedList) || + stream.match(reBulletedList))) { + setNormal(state, stream); + return 'list'; + } + + function testBackward(re) { + return sol || !state.ctx.back || re.test(state.ctx.back); + } + + function testForward(re) { + return stream.eol() || stream.match(re, false); + } + + function testInline(re) { + return stream.match(re) && testBackward(/\W/) && testForward(/\W/); + } + + if (testInline(reFootnoteRef)) { + setNormal(state, stream); + return 'footnote'; + } + + if (testInline(reCitationRef)) { + setNormal(state, stream); + return 'citation'; + } + + ch = stream.next(); + + if (testBackward(rePreInline)) { + if ((ch === ':' || ch === '|') && stream.eat(/\S/)) { + var token; + + if (ch === ':') { + token = 'role'; + } else { + token = 'replacement'; + } + + setState(state, inline, { + ch: ch, + wide: false, + prev: null, + token: token + }); + + return token; + } + + if (ch === '*' || ch === '`') { + var orig = ch, + wide = false; + + ch = stream.next(); + + if (ch == orig) { + wide = true; + ch = stream.next(); + } + + if (ch && !/\s/.test(ch)) { + var token; + + if (orig === '*') { + token = wide ? 'strong' : 'emphasis'; + } else { + token = wide ? 'inline' : 'interpreted'; + } + + setState(state, inline, { + ch: orig, // inline() has to know what to search for + wide: wide, // are we looking for `ch` or `chch` + prev: null, // terminator must not be preceeded with whitespace + token: token // I don't want to recompute this all the time + }); + + return token; + } + } + } + + setNormal(state, ch); + return null; + } + + function inline(stream, state) { + var ch = stream.next(), + token = state.ctx.token; + + function finish(ch) { + state.ctx.prev = ch; + return token; + } + + if (ch != state.ctx.ch) { + return finish(ch); + } + + if (/\s/.test(state.ctx.prev)) { + return finish(ch); + } + + if (state.ctx.wide) { + ch = stream.next(); + + if (ch != state.ctx.ch) { + return finish(ch); + } + } + + if (!stream.eol() && !rePostInline.test(stream.peek())) { + if (state.ctx.wide) { + stream.backUp(1); + } + + return finish(ch); + } + + setState(state, normal); + setNormal(state, ch); + + return token; + } + + function directive(stream, state) { + var token = null; + + if (stream.match(reDirective)) { + token = 'directive'; + } else if (stream.match(reHyperlink)) { + token = 'hyperlink'; + } else if (stream.match(reFootnote)) { + token = 'footnote'; + } else if (stream.match(reCitation)) { + token = 'citation'; + } else { + stream.eatSpace(); + + if (stream.eol()) { + setNormal(state, stream); + return null; + } else { + stream.skipToEnd(); + setState(state, comment); + return 'comment'; + } + } + + setState(state, body, {start: true}); + return token; + } + + function body(stream, state) { + var token = 'body'; + + if (!state.ctx.start || stream.sol()) { + return block(stream, state, token); + } + + stream.skipToEnd(); + setCtx(state); + + return token; + } + + function comment(stream, state) { + return block(stream, state, 'comment'); + } + + function verbatim(stream, state) { + if (!verbatimMode) { + return block(stream, state, 'verbatim'); + } else { + if (stream.sol()) { + if (!stream.eatSpace()) { + setNormal(state, stream); + } + + return null; + } + + return verbatimMode.token(stream, state.ctx.local); + } + } + + function block(stream, state, token) { + if (stream.eol() || stream.eatSpace()) { + stream.skipToEnd(); + return token; + } else { + setNormal(state, stream); + return null; + } + } + + return { + startState: function() { + return {fn: normal, ctx: {}}; + }, + + copyState: function(state) { + return {fn: state.fn, ctx: state.ctx}; + }, + + token: function(stream, state) { + var token = state.fn(stream, state); + return token; + } + }; +}); + +CodeMirror.defineMIME("text/x-rst", "rst"); Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/smalltalk/index.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/smalltalk/index.html (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/smalltalk/index.html 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,56 @@ +<!doctype html> +<html> + <head> + <title>CodeMirror 2: Smalltalk mode</title> + <link rel="stylesheet" href="../../lib/codemirror.css"> + <script src="../../lib/codemirror.js"></script> + <script src="smalltalk.js"></script> + <link rel="stylesheet" href="../../theme/default.css"> + <link rel="stylesheet" href="../../css/docs.css"> + <style> + .CodeMirror {border: 2px solid #dee; border-right-width: 10px;} + .CodeMirror-gutter {border: none; background: #dee;} + .CodeMirror-gutter pre {color: white; font-weight: bold;} + </style> + </head> + <body> + <h1>CodeMirror 2: Smalltalk mode</h1> + +<form><textarea id="code" name="code"> +" + This is a test of the Smalltalk code +" +Seaside.WAComponent subclass: #MyCounter [ + | count | + MyCounter class >> canBeRoot [ ^true ] + + initialize [ + super initialize. + count := 0. + ] + states [ ^{ self } ] + renderContentOn: html [ + html heading: count. + html anchor callback: [ count := count + 1 ]; with: '++'. + html space. + html anchor callback: [ count := count - 1 ]; with: '--'. + ] +] + +MyCounter registerAsApplication: 'mycounter' +</textarea></form> + + <script> + var editor = CodeMirror.fromTextArea(document.getElementById("code"), { + lineNumbers: true, + matchBrackets: true, + mode: "text/x-stsrc", + indentUnit: 4 + }); + </script> + + <p>Simple Smalltalk mode.</p> + + <p><strong>MIME types defined:</strong> <code>text/x-stsrc</code>.</p> + </body> +</html> Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/smalltalk/smalltalk.js =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/smalltalk/smalltalk.js (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/smalltalk/smalltalk.js 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,122 @@ +CodeMirror.defineMode("smalltalk", function(config, parserConfig) { + var keywords = {"true": 1, "false": 1, nil: 1, self: 1, "super": 1, thisContext: 1}; + var indentUnit = config.indentUnit; + + function chain(stream, state, f) { + state.tokenize = f; + return f(stream, state); + } + + var type; + function ret(tp, style) { + type = tp; + return style; + } + + function tokenBase(stream, state) { + var ch = stream.next(); + if (ch == '"') + return chain(stream, state, tokenComment(ch)); + else if (ch == "'") + return chain(stream, state, tokenString(ch)); + else if (ch == "#") { + stream.eatWhile(/[\w\$_]/); + return ret("string", "string"); + } + else if (/\d/.test(ch)) { + stream.eatWhile(/[\w\.]/) + return ret("number", "number"); + } + else if (/[\[\]()]/.test(ch)) { + return ret(ch, null); + } + else { + stream.eatWhile(/[\w\$_]/); + if (keywords && keywords.propertyIsEnumerable(stream.current())) return ret("keyword", "keyword"); + return ret("word", "variable"); + } + } + + function tokenString(quote) { + return function(stream, state) { + var escaped = false, next, end = false; + while ((next = stream.next()) != null) { + if (next == quote && !escaped) {end = true; break;} + escaped = !escaped && next == "\\"; + } + if (end || !(escaped)) + state.tokenize = tokenBase; + return ret("string", "string"); + }; + } + + function tokenComment(quote) { + return function(stream, state) { + var next, end = false; + while ((next = stream.next()) != null) { + if (next == quote) {end = true; break;} + } + if (end) + state.tokenize = tokenBase; + return ret("comment", "comment"); + }; + } + + function Context(indented, column, type, align, prev) { + this.indented = indented; + this.column = column; + this.type = type; + this.align = align; + this.prev = prev; + } + + function pushContext(state, col, type) { + return state.context = new Context(state.indented, col, type, null, state.context); + } + function popContext(state) { + return state.context = state.context.prev; + } + + // Interface + + return { + startState: function(basecolumn) { + return { + tokenize: tokenBase, + context: new Context((basecolumn || 0) - indentUnit, 0, "top", false), + indented: 0, + startOfLine: true + }; + }, + + token: function(stream, state) { + var ctx = state.context; + if (stream.sol()) { + if (ctx.align == null) ctx.align = false; + state.indented = stream.indentation(); + state.startOfLine = true; + } + if (stream.eatSpace()) return null; + var style = state.tokenize(stream, state); + if (type == "comment") return style; + if (ctx.align == null) ctx.align = true; + + if (type == "[") pushContext(state, stream.column(), "]"); + else if (type == "(") pushContext(state, stream.column(), ")"); + else if (type == ctx.type) popContext(state); + state.startOfLine = false; + return style; + }, + + indent: function(state, textAfter) { + if (state.tokenize != tokenBase) return 0; + var firstChar = textAfter && textAfter.charAt(0), ctx = state.context, closing = firstChar == ctx.type; + if (ctx.align) return ctx.column + (closing ? 0 : 1); + else return ctx.indented + (closing ? 0 : indentUnit); + }, + + electricChars: "]" + }; +}); + +CodeMirror.defineMIME("text/x-stsrc", {name: "smalltalk"}); Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/stex/index.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/stex/index.html (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/stex/index.html 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,96 @@ +<!doctype html> +<html> + <head> + <title>CodeMirror 2: sTeX mode</title> + <link rel="stylesheet" href="../../lib/codemirror.css"> + <script src="../../lib/codemirror.js"></script> + <script src="stex.js"></script> + <link rel="stylesheet" href="../../theme/default.css"> + <style>.CodeMirror {background: #f8f8f8;}</style> + <link rel="stylesheet" href="../../css/docs.css"> + </head> + <body> + <h1>CodeMirror 2: sTeX mode</h1> + <form><textarea id="code" name="code"> +\begin{module}[id=bbt-size] +\importmodule[balanced-binary-trees]{balanced-binary-trees} +\importmodule[\KWARCslides{dmath/en/cardinality}]{cardinality} + +\begin{frame} + \frametitle{Size Lemma for Balanced Trees} + \begin{itemize} + \item + \begin{assertion}[id=size-lemma,type=lemma] + Let $G=\tup{V,E}$ be a \termref[cd=binary-trees]{balanced binary tree} + of \termref[cd=graph-depth,name=vertex-depth]{depth}$n>i$, then the set + $\defeq{\livar{V}i}{\setst{\inset{v}{V}}{\gdepth{v} = i}}$ of + \termref[cd=graphs-intro,name=node]{nodes} at + \termref[cd=graph-depth,name=vertex-depth]{depth} $i$ has + \termref[cd=cardinality,name=cardinality]{cardinality} $\power2i$. + \end{assertion} + \item + \begin{sproof}[id=size-lemma-pf,proofend=,for=size-lemma]{via induction over the depth $i$.} + \begin{spfcases}{We have to consider two cases} + \begin{spfcase}{$i=0$} + \begin{spfstep}[display=flow] + then $\livar{V}i=\set{\livar{v}r}$, where $\livar{v}r$ is the root, so + $\eq{\card{\livar{V}0},\card{\set{\livar{v}r}},1,\power20}$. + \end{spfstep} + \end{spfcase} + \begin{spfcase}{$i>0$} + \begin{spfstep}[display=flow] + then $\livar{V}{i-1}$ contains $\power2{i-1}$ vertexes + \begin{justification}[method=byIH](IH)\end{justification} + \end{spfstep} + \begin{spfstep} + By the \begin{justification}[method=byDef]definition of a binary + tree\end{justification}, each $\inset{v}{\livar{V}{i-1}}$ is a leaf or has + two children that are at depth $i$. + \end{spfstep} + \begin{spfstep} + As $G$ is \termref[cd=balanced-binary-trees,name=balanced-binary-tree]{balanced} and $\gdepth{G}=n>i$, $\livar{V}{i-1}$ cannot contain + leaves. + \end{spfstep} + \begin{spfstep}[type=conclusion] + Thus $\eq{\card{\livar{V}i},{\atimes[cdot]{2,\card{\livar{V}{i-1}}}},{\atimes[cdot]{2,\power2{i-1}}},\power2i}$. + \end{spfstep} + \end{spfcase} + \end{spfcases} + \end{sproof} + \item + \begin{assertion}[id=fbbt,type=corollary] + A fully balanced tree of depth $d$ has $\power2{d+1}-1$ nodes. + \end{assertion} + \item + \begin{sproof}[for=fbbt,id=fbbt-pf]{} + \begin{spfstep} + Let $\defeq{G}{\tup{V,E}}$ be a fully balanced tree + \end{spfstep} + \begin{spfstep} + Then $\card{V}=\Sumfromto{i}1d{\power2i}= \power2{d+1}-1$. + \end{spfstep} + \end{sproof} + \end{itemize} + \end{frame} +\begin{note} + \begin{omtext}[type=conclusion,for=binary-tree] + This shows that balanced binary trees grow in breadth very quickly, a consequence of + this is that they are very shallow (and this compute very fast), which is the essence of + the next result. + \end{omtext} +\end{note} +\end{module} + +%%% Local Variables: +%%% mode: LaTeX +%%% TeX-master: "all" +%%% End: \end{document} +</textarea></form> + <script> + var editor = CodeMirror.fromTextArea(document.getElementById("code"), {}); + </script> + + <p><strong>MIME types defined:</strong> <code>text/stex</code>.</p> + + </body> +</html> Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/stex/stex.js =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/stex/stex.js (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/stex/stex.js 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,167 @@ +/* + * Author: Constantin Jucovschi (c.jucovschi(a)jacobs-university.de) + * Licence: MIT + */ + +CodeMirror.defineMode("stex", function(cmCfg, modeCfg) +{ + function pushCommand(state, command) { + state.cmdState.push(command); + } + + function peekCommand(state) { + if (state.cmdState.length>0) + return state.cmdState[state.cmdState.length-1]; + else + return null; + } + + function popCommand(state) { + if (state.cmdState.length>0) { + var plug = state.cmdState.pop(); + plug.closeBracket(); + } + } + + function applyMostPowerful(state) { + var context = state.cmdState; + for (var i = context.length - 1; i >= 0; i--) { + var plug = context[i]; + if (plug.name=="DEFAULT") + continue; + return plug.styleIdentifier(); + } + return null; + } + + function addPluginPattern(pluginName, cmdStyle, brackets, styles) { + return function () { + this.name=pluginName; + this.bracketNo = 0; + this.style=cmdStyle; + this.styles = styles; + this.brackets = brackets; + + this.styleIdentifier = function(content) { + if (this.bracketNo<=this.styles.length) + return this.styles[this.bracketNo-1]; + else + return null; + }; + this.openBracket = function(content) { + this.bracketNo++; + return "bracket"; + }; + this.closeBracket = function(content) { + }; + } + } + + var plugins = new Array(); + + plugins["importmodule"] = addPluginPattern("importmodule", "tag", "{[", ["string", "builtin"]); + plugins["documentclass"] = addPluginPattern("documentclass", "tag", "{[", ["", "atom"]); + plugins["usepackage"] = addPluginPattern("documentclass", "tag", "[", ["atom"]); + plugins["begin"] = addPluginPattern("documentclass", "tag", "[", ["atom"]); + plugins["end"] = addPluginPattern("documentclass", "tag", "[", ["atom"]); + + plugins["DEFAULT"] = function () { + this.name="DEFAULT"; + this.style="tag"; + + this.styleIdentifier = function(content) { + }; + this.openBracket = function(content) { + }; + this.closeBracket = function(content) { + }; + }; + + function setState(state, f) { + state.f = f; + } + + function normal(source, state) { + if (source.match(/^\\[a-z]+/)) { + var cmdName = source.current(); + cmdName = cmdName.substr(1, cmdName.length-1); + var plug = plugins[cmdName]; + if (typeof(plug) == 'undefined') { + plug = plugins["DEFAULT"]; + } + plug = new plug(); + pushCommand(state, plug); + setState(state, beginParams); + return plug.style; + } + + var ch = source.next(); + if (ch == "%") { + setState(state, inCComment); + return "comment"; + } + else if (ch=='}' || ch==']') { + plug = peekCommand(state); + if (plug) { + plug.closeBracket(ch); + setState(state, beginParams); + } else + return "error"; + return "bracket"; + } else if (ch=='{' || ch=='[') { + plug = plugins["DEFAULT"]; + plug = new plug(); + pushCommand(state, plug); + return "bracket"; + } + else if (/\d/.test(ch)) { + source.eatWhile(/[\w.%]/); + return "atom"; + } + else { + source.eatWhile(/[\w-_]/); + return applyMostPowerful(state); + } + } + + function inCComment(source, state) { + source.skipToEnd(); + setState(state, normal); + return "comment"; + } + + function beginParams(source, state) { + var ch = source.peek(); + if (ch == '{' || ch == '[') { + var lastPlug = peekCommand(state); + var style = lastPlug.openBracket(ch); + source.eat(ch); + setState(state, normal); + return "bracket"; + } + if (/[ \t\r]/.test(ch)) { + source.eat(ch); + return null; + } + setState(state, normal); + lastPlug = peekCommand(state); + if (lastPlug) { + popCommand(state); + } + return normal(source, state); + } + + return { + startState: function() { return { f:normal, cmdState:[] }; }, + copyState: function(s) { return { f: s.f, cmdState: s.cmdState.slice(0, s.cmdState.length) }; }, + + token: function(stream, state) { + var t = state.f(stream, state); + var w = stream.current(); + return t; + } + }; +}); + + +CodeMirror.defineMIME("text/x-stex", "stex"); Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/xml/index.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/xml/index.html (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/xml/index.html 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,42 @@ +<!doctype html> +<html> + <head> + <title>CodeMirror 2: XML mode</title> + <link rel="stylesheet" href="../../lib/codemirror.css"> + <script src="../../lib/codemirror.js"></script> + <script src="xml.js"></script> + <link rel="stylesheet" href="../../theme/default.css"> + <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style> + <link rel="stylesheet" href="../../css/docs.css"> + </head> + <body> + <h1>CodeMirror 2: XML mode</h1> + <form><textarea id="code" name="code"> +<html style="color: green"> +  + <head> + <title>HTML Example</title> + </head> + <body> + The indentation tries to be <em>somewhat &quot;do what + I mean&quot;</em>... but might not match your style. + </body> +</html> +</textarea></form> + <script> + var editor = CodeMirror.fromTextArea(document.getElementById("code"), {mode: {name: "xml", htmlMode: true}}); + </script> + <p>The XML mode supports two configuration parameters:</p> + <dl> + <dt><code>htmlMode (boolean)</code></dt> + <dd>This switches the mode to parse HTML instead of XML. This + means attributes do not have to be quoted, and some elements + (such as <code>br</code>) do not require a closing tag.</dd> + <dt><code>alignCDATA (boolean)</code></dt> + <dd>Setting this to true will force the opening tag of CDATA + blocks to not be indented.</dd> + </dl> + + <p><strong>MIME types defined:</strong> <code>application/xml</code>, <code>text/html</code>.</p> + </body> +</html> Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/xml/xml.js =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/xml/xml.js (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/mode/xml/xml.js 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,206 @@ +CodeMirror.defineMode("xml", function(config, parserConfig) { + var indentUnit = config.indentUnit; + var Kludges = parserConfig.htmlMode ? { + autoSelfClosers: {"br": true, "img": true, "hr": true, "link": true, "input": true, + "meta": true, "col": true, "frame": true, "base": true, "area": true}, + doNotIndent: {"pre": true, "!cdata": true}, + allowUnquoted: true + } : {autoSelfClosers: {}, doNotIndent: {"!cdata": true}, allowUnquoted: false}; + var alignCDATA = parserConfig.alignCDATA; + + // Return variables for tokenizers + var tagName, type; + + function inText(stream, state) { + function chain(parser) { + state.tokenize = parser; + return parser(stream, state); + } + + var ch = stream.next(); + if (ch == "<") { + if (stream.eat("!")) { + if (stream.eat("[")) { + if (stream.match("CDATA[")) return chain(inBlock("atom", "]]>")); + else return null; + } + else if (stream.match("--")) return chain(inBlock("comment", "-->")); + else if (stream.match("DOCTYPE")) { + stream.eatWhile(/[\w\._\-]/); + return chain(inBlock("meta", ">")); + } + else return null; + } + else if (stream.eat("?")) { + stream.eatWhile(/[\w\._\-]/); + state.tokenize = inBlock("meta", "?>"); + return "meta"; + } + else { + type = stream.eat("/") ? "closeTag" : "openTag"; + stream.eatSpace(); + tagName = ""; + var c; + while ((c = stream.eat(/[^\s\u00a0=<>\"\'\/?]/))) tagName += c; + state.tokenize = inTag; + return "tag"; + } + } + else if (ch == "&") { + stream.eatWhile(/[^;]/); + stream.eat(";"); + return "atom"; + } + else { + stream.eatWhile(/[^&<]/); + return null; + } + } + + function inTag(stream, state) { + var ch = stream.next(); + if (ch == ">" || (ch == "/" && stream.eat(">"))) { + state.tokenize = inText; + type = ch == ">" ? "endTag" : "selfcloseTag"; + return "tag"; + } + else if (ch == "=") { + type = "equals"; + return null; + } + else if (/[\'\"]/.test(ch)) { + state.tokenize = inAttribute(ch); + return state.tokenize(stream, state); + } + else { + stream.eatWhile(/[^\s\u00a0=<>\"\'\/?]/); + return "word"; + } + } + + function inAttribute(quote) { + return function(stream, state) { + while (!stream.eol()) { + if (stream.next() == quote) { + state.tokenize = inTag; + break; + } + } + return "string"; + }; + } + + function inBlock(style, terminator) { + return function(stream, state) { + while (!stream.eol()) { + if (stream.match(terminator)) { + state.tokenize = inText; + break; + } + stream.next(); + } + return style; + }; + } + + var curState, setStyle; + function pass() { + for (var i = arguments.length - 1; i >= 0; i--) curState.cc.push(arguments[i]); + } + function cont() { + pass.apply(null, arguments); + return true; + } + + function pushContext(tagName, startOfLine) { + var noIndent = Kludges.doNotIndent.hasOwnProperty(tagName) || (curState.context && curState.context.noIndent); + curState.context = { + prev: curState.context, + tagName: tagName, + indent: curState.indented, + startOfLine: startOfLine, + noIndent: noIndent + }; + } + function popContext() { + if (curState.context) curState.context = curState.context.prev; + } + + function element(type) { + if (type == "openTag") {curState.tagName = tagName; return cont(attributes, endtag(curState.startOfLine));} + else if (type == "closeTag") {popContext(); return cont(endclosetag);} + else if (type == "string") { + if (!curState.context || curState.context.name != "!cdata") pushContext("!cdata"); + if (curState.tokenize == inText) popContext(); + return cont(); + } + else return cont(); + } + function endtag(startOfLine) { + return function(type) { + if (type == "selfcloseTag" || + (type == "endTag" && Kludges.autoSelfClosers.hasOwnProperty(curState.tagName.toLowerCase()))) + return cont(); + if (type == "endTag") {pushContext(curState.tagName, startOfLine); return cont();} + return cont(); + }; + } + function endclosetag(type) { + if (type == "endTag") return cont(); + return pass(); + } + + function attributes(type) { + if (type == "word") {setStyle = "attribute"; return cont(attributes);} + if (type == "equals") return cont(attvalue, attributes); + return pass(); + } + function attvalue(type) { + if (type == "word" && Kludges.allowUnquoted) {setStyle = "string"; return cont();} + if (type == "string") return cont(); + return pass(); + } + + return { + startState: function() { + return {tokenize: inText, cc: [], indented: 0, startOfLine: true, tagName: null, context: null}; + }, + + token: function(stream, state) { + if (stream.sol()) { + state.startOfLine = true; + state.indented = stream.indentation(); + } + if (stream.eatSpace()) return null; + + setStyle = type = tagName = null; + var style = state.tokenize(stream, state); + if ((style || type) && style != "xml-comment") { + curState = state; + while (true) { + var comb = state.cc.pop() || element; + if (comb(type || style)) break; + } + } + state.startOfLine = false; + return setStyle || style; + }, + + indent: function(state, textAfter) { + var context = state.context; + if (context && context.noIndent) return 0; + if (alignCDATA && /<!\[CDATA\[/.test(textAfter)) return 0; + if (context && /^<\//.test(textAfter)) + context = context.prev; + while (context && !context.startOfLine) + context = context.prev; + if (context) return context.indent + indentUnit; + else return 0; + }, + + electricChars: "/" + }; +}); + +CodeMirror.defineMIME("application/xml", "xml"); +CodeMirror.defineMIME("text/html", {name: "xml", htmlMode: true}); Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/oldrelease.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/oldrelease.html (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/oldrelease.html 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,150 @@ +<!doctype html> +<html> + <head> + <title>CodeMirror</title> + <link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Droid+Sans|Droid+Sans:bold"/> + <link rel="stylesheet" type="text/css" href="css/docs.css"/> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> + <link rel="alternate" href="http://twitter.com/statuses/user_timeline/242283288.rss" type="application/rss+xml"/> + </head> + <body> + +<h1><span class="logo-braces">{ }</span> <a href="http://codemirror.net/">CodeMirror</a></h1> + +<pre class="grey"> +<img src="css/baboon.png" class="logo" alt="logo"/>/* Old release history */ + +</pre> + + <p class="rel">19-01-2011: <a href="http://codemirror.net/codemirror-0.93.zip">Version 0.93</a>:</p> + <ul class="rel-note"> + <li>Added a <a href="contrib/regex/index.html">Regular Expression</a> parser.</li> + <li>Fixes to the PHP parser.</li> + <li>Support for regular expression in search/replace.</li> + <li>Add <code>save</code> method to instances created with <code>fromTextArea</code>.</li> + <li>Add support for MS T-SQL in the SQL parser.</li> + <li>Support use of CSS classes for highlighting brackets.</li> + <li>Fix yet another hang with line-numbering in hidden editors.</li> + </ul> + + <p class="rel">17-12-2010: <a href="http://codemirror.net/codemirror-0.92.zip">Version 0.92</a>:</p> + <ul class="rel-note"> + <li>Make CodeMirror work in XHTML documents.</li> + <li>Fix bug in handling of backslashes in Python strings.</li> + <li>The <code>styleNumbers</code> option is now officially + supported and documented.</li> + <li><code>onLineNumberClick</code> option added.</li> + <li>More consistent names <code>onLoad</code> and + <code>onCursorActivity</code> callbacks. Old names still work, but + are deprecated.</li> + <li>Add a <a href="contrib/freemarker/index.html">Freemarker</a> mode.</li> + </ul> + + <p class="rel">11-11-2010: <a + href="http://codemirror.net/codemirror-0.91.zip">Version 0.91</a>:</p> + <ul class="rel-note"> + <li>Adds support for <a href="contrib/java">Java</a>.</li> + <li>Small additions to the <a href="contrib/php">PHP</a> and <a href="contrib/sql">SQL</a> parsers.</li> + <li>Work around various <a href="https://bugs.webkit.org/show_bug.cgi?id=47806">Webkit</a> <a href="https://bugs.webkit.org/show_bug.cgi?id=23474">issues</a>.</li> + <li>Fix <code>toTextArea</code> to update the code in the textarea.</li> + <li>Add a <code>noScriptCaching</code> option (hack to ease development).</li> + <li>Make sub-modes of <a href="mixedtest.html">HTML mixed</a> mode configurable.</li> + </ul> + + <p class="rel">02-10-2010: <a + href="http://codemirror.net/codemirror-0.9.zip">Version 0.9</a>:</p> + <ul class="rel-note"> + <li>Add support for searching backwards.</li> + <li>There are now parsers for <a href="contrib/scheme/index.html">Scheme</a>, <a href="contrib/xquery/index.html">XQuery</a>, and <a href="contrib/ometa/index.html">OmetaJS</a>.</li> + <li>Makes <code>height: "dynamic"</code> more robust.</li> + <li>Fixes bug where paste did not work on OS X.</li> + <li>Add a <code>enterMode</code> and <code>electricChars</code> options to make indentation even more customizable.</li> + <li>Add <code>firstLineNumber</code> option.</li> + <li>Fix bad handling of <code>@media</code> rules by the CSS parser.</li> + <li>Take a new, more robust approach to working around the invisible-last-line bug in WebKit.</li> + </ul> + + <p class="rel">22-07-2010: <a + href="http://codemirror.net/codemirror-0.8.zip">Version 0.8</a>:</p> + <ul class="rel-note"> + <li>Add a <code>cursorCoords</code> method to find the screen + coordinates of the cursor.</li> + <li>A number of fixes and support for more syntax in the PHP parser.</li> + <li>Fix indentation problem with JSON-mode JS parser in Webkit.</li> + <li>Add a <a href="compress.html">minification</a> UI.</li> + <li>Support a <code>height: dynamic</code> mode, where the editor's + height will adjust to the size of its content.</li> + <li>Better support for IME input mode.</li> + <li>Fix JavaScript parser getting confused when seeing a no-argument + function call.</li> + <li>Have CSS parser see the difference between selectors and other + identifiers.</li> + <li>Fix scrolling bug when pasting in a horizontally-scrolled + editor.</li> + <li>Support <code>toTextArea</code> method in instances created with + <code>fromTextArea</code>.</li> + <li>Work around new Opera cursor bug that causes the cursor to jump + when pressing backspace at the end of a line.</li> + </ul> + + <p class="rel">27-04-2010: <a + href="http://codemirror.net/codemirror-0.67.zip">Version + 0.67</a>:</p> + <p class="rel-note">More consistent page-up/page-down behaviour + across browsers. Fix some issues with hidden editors looping forever + when line-numbers were enabled. Make PHP parser parse + <code>"\\"</code> correctly. Have <code>jumpToLine</code> work on + line handles, and add <code>cursorLine</code> function to fetch the + line handle where the cursor currently is. Add new + <code>setStylesheet</code> function to switch style-sheets in a + running editor.</p> + + <p class="rel">01-03-2010: <a + href="http://codemirror.net/codemirror-0.66.zip">Version + 0.66</a>:</p> + <p class="rel-note">Adds <code>removeLine</code> method to API. + Introduces the <a href="contrib/plsql/index.html">PLSQL parser</a>. + Marks XML errors by adding (rather than replacing) a CSS class, so + that they can be disabled by modifying their style. Fixes several + selection bugs, and a number of small glitches.</p> + + <p class="rel">12-11-2009: <a + href="http://codemirror.net/codemirror-0.65.zip">Version + 0.65</a>:</p> + <p class="rel-note">Add support for having both line-wrapping and + line-numbers turned on, make paren-highlighting style customisable + (<code>markParen</code> and <code>unmarkParen</code> config + options), work around a selection bug that Opera + <em>re</em>introduced in version 10.</p> + + <p class="rel">23-10-2009: <a + href="http://codemirror.net/codemirror-0.64.zip">Version + 0.64</a>:</p> + <p class="rel-note">Solves some issues introduced by the + paste-handling changes from the previous release. Adds + <code>setSpellcheck</code>, <code>setTextWrapping</code>, + <code>setIndentUnit</code>, <code>setUndoDepth</code>, + <code>setTabMode</code>, and <code>setLineNumbers</code> to + customise a running editor. Introduces an <a + href="contrib/sql/index.html">SQL</a> parser. Fixes a few small + problems in the <a href="contrib/python/index.html">Python</a> + parser. And, as usual, add workarounds for various newly discovered + browser incompatibilities.</p> + +<p class="rel"><em>31-08-2009</em>: <a +href="http://codemirror.net/codemirror-0.63.zip">Version +0.63</a>:</p> +<p class="rel-note"> Overhaul of paste-handling (less fragile), fixes for several +serious IE8 issues (cursor jumping, end-of-document bugs) and a number +of small problems.</p> + +<p class="rel"><em>30-05-2009</em>: <a +href="http://codemirror.net/codemirror-0.62.zip">Version +0.62</a>:</p> +<p class="rel-note">Introduces <a href="contrib/python/index.html">Python</a> +and <a href="contrib/lua/index.html">Lua</a> parsers. Add +<code>setParser</code> (on-the-fly mode changing) and +<code>clearHistory</code> methods. Make parsing passes time-based +instead of lines-based (see the <code>passTime</code> option).</p> + +</body></html> Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/test/index.html =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/test/index.html (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/test/index.html 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,29 @@ +<!doctype html> +<html> + <head> + <title>CodeMirror 2: Test Suite</title> + <link rel="stylesheet" href="../lib/codemirror.css"> + <script src="../lib/codemirror.js"></script> + <link rel="stylesheet" href="../theme/default.css"> + <script src="../mode/javascript/javascript.js"></script> + + <style type="text/css"> + .ok {color: #0e0;} + .failure {color: #e00;} + .error {color: #c90;} + </style> + </head> + <body> + <h1>CodeMirror 2: Test Suite</h1> + + <p>A limited set of programmatic sanity tests for CodeMirror.</p> + + <pre id=output></pre> + + <div style="visibility: hidden" id=testground> + <form><textarea id="code" name="code"></textarea><input type=submit value=ok name=submit></form> + </div> + + <script src="test.js"></script> + </body> +</html> Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/test/test.js =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/test/test.js (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/test/test.js 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,249 @@ +var tests = []; + +test("fromTextArea", function() { + var te = document.getElementById("code"); + te.value = "CONTENT"; + var cm = CodeMirror.fromTextArea(te); + is(!te.offsetHeight); + eq(cm.getValue(), "CONTENT"); + cm.setValue("foo\nbar"); + eq(cm.getValue(), "foo\nbar"); + cm.save(); + is(/^foo\r?\nbar$/.test(te.value)); + cm.setValue("xxx"); + cm.toTextArea(); + is(te.offsetHeight); + eq(te.value, "xxx"); +}); + +testCM("getRange", function(cm) { + eq(cm.getLine(0), "1234"); + eq(cm.getLine(1), "5678"); + eq(cm.getLine(2), null); + eq(cm.getLine(-1), null); + eq(cm.getRange({line: 0, ch: 0}, {line: 0, ch: 3}), "123"); + eq(cm.getRange({line: 0, ch: -1}, {line: 0, ch: 200}), "1234"); + eq(cm.getRange({line: 0, ch: 2}, {line: 1, ch: 2}), "34\n56"); + eq(cm.getRange({line: 1, ch: 2}, {line: 100, ch: 0}), "78"); +}, {value: "1234\n5678"}); + +testCM("replaceRange", function(cm) { + eq(cm.getValue(), ""); + cm.replaceRange("foo\n", {line: 0, ch: 0}); + eq(cm.getValue(), "foo\n"); + cm.replaceRange("a\nb", {line: 0, ch: 1}); + eq(cm.getValue(), "fa\nboo\n"); + eq(cm.lineCount(), 3); + cm.replaceRange("xyzzy", {line: 0, ch: 0}, {line: 1, ch: 1}); + eq(cm.getValue(), "xyzzyoo\n"); + cm.replaceRange("abc", {line: 0, ch: 0}, {line: 10, ch: 0}); + eq(cm.getValue(), "abc"); + eq(cm.lineCount(), 1); +}); + +testCM("selection", function(cm) { + cm.setSelection({line: 0, ch: 4}, {line: 2, ch: 2}); + is(cm.somethingSelected()); + eq(cm.getSelection(), "11\n222222\n33"); + eqPos(cm.getCursor(false), {line: 2, ch: 2}); + eqPos(cm.getCursor(true), {line: 0, ch: 4}); + cm.setSelection({line: 1, ch: 0}); + is(!cm.somethingSelected()); + eq(cm.getSelection(), ""); + eqPos(cm.getCursor(true), {line: 1, ch: 0}); + cm.replaceSelection("abc"); + eq(cm.getSelection(), "abc"); + eq(cm.getValue(), "111111\nabc222222\n333333"); + cm.replaceSelection("def", "end"); + eq(cm.getSelection(), ""); + eqPos(cm.getCursor(true), {line: 1, ch: 3}); + cm.setCursor({line: 2, ch: 1}); + eqPos(cm.getCursor(true), {line: 2, ch: 1}); + cm.setCursor(1, 2); + eqPos(cm.getCursor(true), {line: 1, ch: 2}); +}, {value: "111111\n222222\n333333"}); + +testCM("lines", function(cm) { + eq(cm.getLine(0), "111111"); + eq(cm.getLine(1), "222222"); + eq(cm.getLine(-1), null); + cm.removeLine(1); + cm.setLine(1, "abc"); + eq(cm.getValue(), "111111\nabc"); +}, {value: "111111\n222222\n333333"}); + +testCM("indent", function(cm) { + cm.indentLine(1); + eq(cm.getLine(1), " blah();"); + cm.setOption("indentUnit", 8); + cm.indentLine(1); + eq(cm.getLine(1), "\tblah();"); +}, {value: "if (x) {\nblah();\n}", indentUnit: 3, indentWithTabs: true}); + +test("defaults", function() { + var olddefaults = CodeMirror.defaults, defs = CodeMirror.defaults = {}; + for (var opt in olddefaults) defs[opt] = olddefaults[opt]; + defs.indentUnit = 5; + defs.value = "uu"; + defs.enterMode = "keep"; + defs.tabindex = 55; + var place = document.getElementById("testground"), cm = CodeMirror(place); + try { + eq(cm.getOption("indentUnit"), 5); + cm.setOption("indentUnit", 10); + eq(defs.indentUnit, 5); + eq(cm.getValue(), "uu"); + eq(cm.getOption("enterMode"), "keep"); + eq(cm.getInputField().tabindex, 55); + } + finally { + CodeMirror.defaults = olddefaults; + place.removeChild(cm.getWrapperElement()); + } +}); + +testCM("lineInfo", function(cm) { + eq(cm.lineInfo(-1), null); + var lh = cm.setMarker(1, "FOO", "bar"); + var info = cm.lineInfo(1); + eq(info.text, "222222"); + eq(info.markerText, "FOO"); + eq(info.markerClass, "bar"); + eq(info.line, 1); + eq(cm.lineInfo(2).markerText, null); + cm.clearMarker(lh); + eq(cm.lineInfo(1).markerText, null); +}, {value: "111111\n222222\n333333"}); + +testCM("coords", function(cm) { + var scroller = cm.getWrapperElement().getElementsByClassName("CodeMirror-scroll")[0]; + scroller.style.height = "100px"; + var content = []; + for (var i = 0; i < 200; ++i) content.push("------------------------------" + i); + cm.setValue(content.join("\n")); + var top = cm.charCoords({line: 0, ch: 0}); + var bot = cm.charCoords({line: 200, ch: 30}); + is(top.x < bot.x); + is(top.y < bot.y); + is(top.y < top.yBot); + scroller.scrollTop = 100; + cm.refresh(); + var top2 = cm.charCoords({line: 0, ch: 0}); + is(top.y > top2.y); + eq(top.x, top2.x); +}); + +testCM("coordsChar", function(cm) { + var content = []; + for (var i = 0; i < 70; ++i) content.push("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"); + cm.setValue(content.join("\n")); + for (var x = 0; x < 35; x += 2) { + for (var y = 0; y < 70; y += 5) { + cm.setCursor(y, x); + var pos = cm.coordsChar(cm.charCoords({line: y, ch: x})); + eq(pos.line, y); + eq(pos.ch, x); + } + } +}); + +testCM("undo", function(cm) { + cm.setLine(0, "def"); + eq(cm.historySize().undo, 1); + cm.undo(); + eq(cm.getValue(), "abc"); + eq(cm.historySize().undo, 0); + eq(cm.historySize().redo, 1); + cm.redo(); + eq(cm.getValue(), "def"); + eq(cm.historySize().undo, 1); + eq(cm.historySize().redo, 0); + cm.setValue("1\n\n\n2"); + eq(cm.historySize().undo, 0); + for (var i = 0; i < 20; ++i) { + cm.replaceRange("a", {line: 0, ch: 0}); + cm.replaceRange("b", {line: 3, ch: 0}); + } + eq(cm.historySize().undo, 40); + for (var i = 0; i < 38; ++i) cm.undo(); + eq(cm.historySize().undo, 2); + eq(cm.historySize().redo, 38); + eq(cm.getValue(), "a1\n\n\nb2"); + cm.setOption("undoDepth", 10); + for (var i = 0; i < 20; ++i) { + cm.replaceRange("a", {line: 0, ch: 0}); + cm.replaceRange("b", {line: 3, ch: 0}); + } + eq(cm.historySize().undo, 10); +}, {value: "abc"}); + +testCM("undoMultiLine", function(cm) { + cm.replaceRange("x", {line:0, ch: 0}); + cm.replaceRange("y", {line:1, ch: 0}); + cm.undo(); + eq(cm.getValue(), "abc\ndef\nghi"); + cm.replaceRange("y", {line:1, ch: 0}); + cm.replaceRange("x", {line:0, ch: 0}); + cm.undo(); + eq(cm.getValue(), "abc\ndef\nghi"); + cm.replaceRange("y", {line:2, ch: 0}); + cm.replaceRange("x", {line:1, ch: 0}); + cm.replaceRange("z", {line:2, ch: 0}); + cm.undo(); + eq(cm.getValue(), "abc\ndef\nghi"); +}, {value: "abc\ndef\nghi"}); + +// Scaffolding + +function htmlEscape(str) { + return str.replace(/[<&]/g, function(str) {return str == "&" ? "&" : "<";}); +} +function forEach(arr, f) { + for (var i = 0, e = arr.length; i < e; ++i) f(arr[i]); +} + +function Failure(why) {this.message = why;} + +function test(name, run) {tests.push({name: name, func: run});} +function testCM(name, run, opts) { + test(name, function() { + var place = document.getElementById("testground"), cm = CodeMirror(place, opts); + try {run(cm);} + finally {place.removeChild(cm.getWrapperElement());} + }); +} + +function runTests() { + var failures = [], run = 0; + for (var i = 0; i < tests.length; ++i) { + var test = tests[i]; + try {test.func();} + catch(e) { + if (e instanceof Failure) + failures.push({type: "failure", test: test.name, text: e.message}); + else + failures.push({type: "error", test: test.name, text: e.toString()}); + } + run++; + } + var html = [run + " tests run."]; + if (failures.length) + forEach(failures, function(fail) { + html.push(fail.test + ': <span class="' + fail.type + '">' + htmlEscape(fail.text) + "</span>"); + }); + else html.push('<span class="ok">All passed.</span>'); + document.getElementById("output").innerHTML = html.join("\n"); +} + +function eq(a, b, msg) { + if (a != b) throw new Failure(a + " != " + b + (msg ? " (" + msg + ")" : "")); +} +function eqPos(a, b, msg) { + eq(a.line, b.line, msg); + eq(a.ch, b.ch, msg); +} +function is(a, msg) { + if (!a) throw new Failure("assertion failed" + (msg ? " (" + msg + ")" : "")); +} + +window.onload = runTests; Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/theme/default.css =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/theme/default.css (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/theme/default.css 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,18 @@ +.cm-s-default span.cm-keyword {color: #708;} +.cm-s-default span.cm-atom {color: #219;} +.cm-s-default span.cm-number {color: #164;} +.cm-s-default span.cm-def {color: #00f;} +.cm-s-default span.cm-variable {color: black;} +.cm-s-default span.cm-variable-2 {color: #05a;} +.cm-s-default span.cm-variable-3 {color: #0a5;} +.cm-s-default span.cm-property {color: black;} +.cm-s-default span.cm-operator {color: black;} +.cm-s-default span.cm-comment {color: #a50;} +.cm-s-default span.cm-string {color: #a11;} +.cm-s-default span.cm-meta {color: #555;} +.cm-s-default span.cm-error {color: #f00;} +.cm-s-default span.cm-qualifier {color: #555;} +.cm-s-default span.cm-builtin {color: #30a;} +.cm-s-default span.cm-bracket {color: #cc7;} +.cm-s-default span.cm-tag {color: #170;} +.cm-s-default span.cm-attribute {color: #00c;} Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/theme/elegant.css =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/theme/elegant.css (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/theme/elegant.css 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,9 @@ +.cm-s-elegant span.cm-number, .cm-s-elegant span.cm-string, .cm-s-elegant span.cm-atom {color: #762;} +.cm-s-elegant span.cm-comment {color: #262;font-style: italic;} +.cm-s-elegant span.cm-meta {color: #555;font-style: italic;} +.cm-s-elegant span.cm-variable {color: black;} +.cm-s-elegant span.cm-variable-2 {color: #b11;} +.cm-s-elegant span.cm-qualifier {color: #555;} +.cm-s-elegant span.cm-keyword {color: #730;} +.cm-s-elegant span.cm-builtin {color: #30a;} +.cm-s-elegant span.cm-error {background-color: #fdd;} Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/theme/neat.css =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/theme/neat.css (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/theme/neat.css 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,8 @@ +.cm-s-neat span.cm-comment { color: #a86; } +.cm-s-neat span.cm-keyword { font-weight: bold; color: blue; } +.cm-s-neat span.cm-string { color: #a22; } +.cm-s-neat span.cm-builtin { font-weight: bold; color: #077; } +.cm-s-neat span.cm-special { font-weight: bold; color: #0aa; } +.cm-s-neat span.cm-variable { color: black; } +.cm-s-neat span.cm-number, .cm-s-neat span.cm-atom { color: #3a3; } +.cm-s-neat span.cm-meta {color: #555;} Added: trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/theme/night.css =================================================================== --- trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/theme/night.css (rev 0) +++ trunk/src/main/webapp/codemirror-ui/lib/CodeMirror-2.1/theme/night.css 2011-06-28 12:55:36 UTC (rev 138) @@ -0,0 +1,20 @@ +/* Loosely based on the Midnight Textmate theme */ + +.cm-s-night { background: #0a001f; color: #f8f8f8; } +.cm-s-night span.CodeMirror-selected { background: #a8f !important; } +.cm-s-night .CodeMirror-gutter { background: #0a001f; border-right: 1px solid #aaa; } +.cm-s-night .CodeMirror-gutter-text { color: #f8f8f8; } +.cm-s-night .CodeMirror-cursor { border-left: 1px solid white !important; } + +.cm-s-night span.cm-comment { color: #6900a1; } +.cm-s-night span.cm-atom { color: #845dc4; } +.cm-s-night span.cm-number { color: #ffd500; } +.cm-s-night span.cm-keyword { color: #599eff; } +.cm-s-night span.cm-string { color: #37f14a; } +.cm-s-night span.cm-meta { color: #7678e2; } +.cm-s-night span.cm-variable-2 { color: #99b2ff; } +.cm-s-night span.cm-variable-3, .cm-s-night span.cm-def { white; } +.cm-s-night span.cm-error { color: #9d1e15; } +.cm-s-night span.cm-bracket { color: #8da6ce; } +.cm-s-night span.cm-comment { color: #6900a1; } +.cm-s-night span.cm-builtin, .cm-s-night span.cm-special { color: #ff9e59; } Modified: trunk/src/main/webapp/css/main.css =================================================================== --- trunk/src/main/webapp/css/main.css 2011-06-24 14:18:08 UTC (rev 137) +++ trunk/src/main/webapp/css/main.css 2011-06-28 12:55:36 UTC (rev 138) @@ -2,13 +2,18 @@ font-family: Verdana,Arial,Helvetica,sans-serif; background-color: #b8b1b1; + max-width:70%; + margin:auto; } -textarea { - width:72%; + + +#formulaire { + width:70%; margin:auto; display:block; - min-height: 150px; + padding:1%; + text-align:center; } #prevtitle { @@ -24,7 +29,6 @@ } #search { - width:30%; margin:auto; display:block; border : solid 2px black;

1 0

r137 - trunk/src/main/java/org/nuiton/scmwebeditor/actions
by kcardineaud＠users.nuiton.org 24 Jun '11

24 Jun '11

Author: kcardineaud Date: 2011-06-24 16:18:08 +0200 (Fri, 24 Jun 2011) New Revision: 137 Url: http://nuiton.org/repositories/revision/scmwebeditor/137 Log: The upload file function checkout the repository in a temp directory before commit Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java 2011-06-24 13:43:55 UTC (rev 136) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java 2011-06-24 14:18:08 UTC (rev 137) @@ -171,9 +171,9 @@ } catch (IOException e) { log.error("Can't find the checkout file",e); } - + /* * Commit process */ Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java 2011-06-24 13:43:55 UTC (rev 136) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java 2011-06-24 14:18:08 UTC (rev 137) @@ -1,6 +1,7 @@ package org.nuiton.scmwebeditor.actions; import java.io.File; + import java.io.IOException; import javax.servlet.http.HttpServletRequest; @@ -16,6 +17,8 @@ import org.tmatesoft.svn.core.SVNDepth; import org.tmatesoft.svn.core.SVNException; import org.tmatesoft.svn.core.wc.SVNClientManager; +import org.tmatesoft.svn.core.wc.SVNRevision; +import org.tmatesoft.svn.core.wc.SVNUpdateClient; import com.opensymphony.xwork2.Action; @@ -87,7 +90,52 @@ HttpSession httpSession = request.getSession(true); SvnSession svnSess = getSvnSession(httpSession); + + + +// Resetting authentification information and manager + svnSess.updateAuthentication( + svnSess.getLogin() != null && !svnSess.getLogin().equalsIgnoreCase("") ? svnSess.getLogin() : username, + svnSess.getPassword() != null && !svnSess.getPassword().equalsIgnoreCase("") ? svnSess.getPassword() : pw); + + + /* + * Checkout process + */ + SVNUpdateClient upclient = new SVNUpdateClient(svnSess.getManager(), svnSess.getSvnOption()); + + + try { + if (log.isDebugEnabled()) { + log.debug("Do Checkout of " + svnSess.getRemoteUrl()); + } + upclient.doCheckout(svnSess.getRemoteUrl(), svnSess.getCheckoutdir(), + SVNRevision.HEAD, SVNRevision.HEAD, SVNDepth.FILES, false); + } catch (SVNAuthenticationException authexep) { + + // if svn authentication failed user is redirected on login page + if(log.isDebugEnabled()) { + log.debug("Private SCM on reading " + svnSess.getRemoteUrl()); + } + //On supprime le repertoire temporaire + delTempDirectory(svnSess); + //redirect to a login page + return "error"; + + } catch (SVNException e) { + //Suppression du repertoire temporaire + delTempDirectory(svnSess); + return "error"; + } + + File checkoutDir = svnSess.getCheckoutdir(); + + + + //Copy file in checkourdir + + String checkoutPath = checkoutDir.getAbsolutePath(); File file = new File(checkoutPath,uploadFileName); @@ -98,15 +146,13 @@ } catch (IOException e) { log.error("Can't copy the file to the checkout directory",e); } - -// Resetting authentification information and manager - svnSess.updateAuthentication( - svnSess.getLogin() != null && !svnSess.getLogin().equalsIgnoreCase("") ? svnSess.getLogin() : username, - svnSess.getPassword() != null && !svnSess.getPassword().equalsIgnoreCase("") ? svnSess.getPassword() : pw); + + //Commit process + SVNClientManager manager = svnSess.getManager(); File[] tabFile = new File[1]; @@ -120,15 +166,20 @@ } catch (SVNAuthenticationException authexep) { log.error("authentification fail"); request.setAttribute(ATTRIBUTE_BAD_LOGIN, true); + //Suppression du repertoire temporaire + delTempDirectory(svnSess); return Action.LOGIN; } catch (SVNException e) { log.error("Erreur SVN",e); request.setAttribute("error", true); + //Suppression du repertoire temporaire + delTempDirectory(svnSess); return Action.ERROR; } - + //Suppression du repertoire temporaire + delTempDirectory(svnSess); return Action.SUCCESS; }

1 0

r136 - in trunk: . src/main/java/org/nuiton/scmwebeditor src/main/java/org/nuiton/scmwebeditor/actions src/main/webapp
by kcardineaud＠users.nuiton.org 24 Jun '11

24 Jun '11

Author: kcardineaud Date: 2011-06-24 15:43:55 +0200 (Fri, 24 Jun 2011) New Revision: 136 Url: http://nuiton.org/repositories/revision/scmwebeditor/136 Log: Svn files are show in order by repertory Added: trunk/src/main/java/org/nuiton/scmwebeditor/UrlSvnFile.java Modified: trunk/pom.xml trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java trunk/src/main/java/org/nuiton/scmwebeditor/actions/SearchAction.java trunk/src/main/webapp/BadFileRedirect.jsp trunk/src/main/webapp/Search.jsp Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-06-24 08:13:58 UTC (rev 135) +++ trunk/pom.xml 2011-06-24 13:43:55 UTC (rev 136) @@ -73,6 +73,11 @@ <version>1.2.1</version> </dependency> + <dependency> + <groupId>org.apache.tika</groupId> + <artifactId>tika-core</artifactId> + <version>0.9</version> + </dependency>  Modified: trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java 2011-06-24 08:13:58 UTC (rev 135) +++ trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java 2011-06-24 13:43:55 UTC (rev 136) @@ -30,6 +30,11 @@ import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.tika.exception.TikaException; +import org.apache.tika.metadata.Metadata; +import org.apache.tika.parser.AutoDetectParser; +import org.apache.tika.sax.BodyContentHandler; +import org.xml.sax.SAXException; import com.opensymphony.xwork2.ActionSupport; @@ -78,7 +83,7 @@ protected static final String ATTRIBUTE_LOGIN = "Login"; protected static final String ATTRIBUTE_IS_LOGIN = "IsLogin"; protected static final String ATTRIBUTE_BAD_LOGIN = "badLogin"; - protected static final String ATTRIBUTE_PROJECT_URL = "Project_url"; + protected static final String ATTRIBUTE_PROJECT_URL = "projectUrl"; protected static final String ATTRIBUTE_SCM_EDITOR_URI = "scmEditorUri"; protected static final String ATTRIBUTE_PREVIEW_SERVLET_URL = "previewServletUrl"; protected static final String ATTRIBUTE_FILESEARCH_SERVLET_URL = "searchServletUrl"; @@ -215,5 +220,18 @@ String url = buffer.toString(); return url; } + + + protected String getMineType(File file) throws IOException, SAXException, TikaException { + FileInputStream is = new FileInputStream(file); + BodyContentHandler contenthandler = new BodyContentHandler(); + Metadata metadata = new Metadata(); + metadata.set(Metadata.RESOURCE_NAME_KEY, file.getName()); + AutoDetectParser parser = new AutoDetectParser(); + parser.parse(is, contenthandler, metadata); + String result = metadata.get(Metadata.CONTENT_TYPE); + log.info("Mine type of " + file.getName() + " is : " + result); + return result; + } } Added: trunk/src/main/java/org/nuiton/scmwebeditor/UrlSvnFile.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/UrlSvnFile.java (rev 0) +++ trunk/src/main/java/org/nuiton/scmwebeditor/UrlSvnFile.java 2011-06-24 13:43:55 UTC (rev 136) @@ -0,0 +1,50 @@ +package org.nuiton.scmwebeditor; + + + +public class UrlSvnFile implements java.lang.Comparable<UrlSvnFile> { + String url; + + public UrlSvnFile (String url) { + this.url=url; + } + + public String toString() { + return url; + } + + public int getLevel() { + String[] tab = url.split("/"); + return tab.length; + } + + + @Override + public int compareTo(UrlSvnFile o) { + int level1 = o.getLevel(); + int level2 = this.getLevel(); + + if (level1 > level2) { + return -1; + } + else if(level1 == level2) { + if(o.toString().length() > this.toString().length()) { + return -1; + } + else if(o.toString().length() == this.toString().length()) { + return 0; + } + else { + return 1; + } + + } + else { + return 1; + } + } + + + + +} Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java 2011-06-24 08:13:58 UTC (rev 135) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java 2011-06-24 13:43:55 UTC (rev 136) @@ -177,10 +177,6 @@ /* * Commit process */ - - String originalText = StringEscapeUtils.unescapeHtml(origText); - String myText = StringEscapeUtils.unescapeHtml(newText); - File pathToFile = new File(svnSess.getCheckoutdir(), svnSess.getFileName()); SVNCommitClient commitClient = new SVNCommitClient(svnSess.getManager(), svnSess.getSvnOption()); Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java 2011-06-24 08:13:58 UTC (rev 135) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java 2011-06-24 13:43:55 UTC (rev 136) @@ -25,9 +25,7 @@ public class ScmWebEditorMainAction extends ScmWebEditorBaseAction implements ServletRequestAware { - /** - * - */ + private static final long serialVersionUID = 8361035067228171624L; private static final Log log = LogFactory.getLog(ScmWebEditorMainAction.class); @@ -110,6 +108,7 @@ log.debug("--------------------------"); log.debug("Connection to SCMWebEditor"); log.debug("--------------------------"); + /* Si il n'y a pas de parametre, l'utilisateur est renvoyé * vers la page de configuration (OutConnection) @@ -158,7 +157,6 @@ setSvnSession(httpSession, svnSess); -// Tempdir creation on servlet default temporary directory DAVRepositoryFactory.setup(); @@ -186,6 +184,7 @@ return Action.LOGIN; } catch (SVNException e) { + request.setAttribute("projectUrl", projectUrl); //Suppression du repertoire temporaire delTempDirectory(svnSess); return "erreurPath"; @@ -193,7 +192,26 @@ File CheckOutFile = new File(svnSess.getCheckoutdir(), svnSess.getFileName()); + + String mineType =null; try { + mineType = getMineType(CheckOutFile); + } catch (Exception e) { + if(log.isErrorEnabled()) { + log.error("",e); + } + } + + + + // Si le fichier n'est pas de type texte, on ne peut pas l'éditer + if(!mineType.contains("text")) { + request.setAttribute("projectUrl", projectUrl); + return "erreurPath"; + } + + + try { String originalText = FileUtils.readFileToString(CheckOutFile); request.setAttribute(PARAMETER_FORMAT, svnSess.getFormat()); request.setAttribute(ATTRIBUTE_ORIG_TEXT, StringEscapeUtils.escapeHtml(originalText)); Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/SearchAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/SearchAction.java 2011-06-24 08:13:58 UTC (rev 135) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/SearchAction.java 2011-06-24 13:43:55 UTC (rev 136) @@ -1,12 +1,14 @@ package org.nuiton.scmwebeditor.actions; import java.util.Collection; +import java.util.Collections; import java.util.Iterator; import java.util.LinkedList; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.scmwebeditor.ScmWebEditorBaseAction; +import org.nuiton.scmwebeditor.UrlSvnFile; import org.tmatesoft.svn.core.SVNAuthenticationException; import org.tmatesoft.svn.core.SVNDirEntry; import org.tmatesoft.svn.core.SVNException; @@ -36,7 +38,7 @@ String address; - LinkedList<String> files; + LinkedList<UrlSvnFile> files; String username; String pw; @@ -56,7 +58,7 @@ } - public LinkedList<String> getFiles() { + public LinkedList<UrlSvnFile> getFiles() { return files; } @@ -110,7 +112,7 @@ password=pw; } - files = new LinkedList<String>(); + files = new LinkedList<UrlSvnFile>(); if(address.endsWith("/")) { @@ -143,7 +145,7 @@ } listEntries( repository , "" ); - + Collections.sort(files); } catch (SVNAuthenticationException authexep) { return "authError"; @@ -151,7 +153,8 @@ catch ( SVNException svne ) { log.error("Can't access to the repository",svne); } - + + return Action.SUCCESS; } @@ -161,8 +164,7 @@ try { entries = repository.getDir( path, -1 , null , (Collection<?>) null ); } catch (SVNException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + log.error("Can not reach the repository",e); } Iterator<?> iterator = entries.iterator(); @@ -170,7 +172,6 @@ SVNDirEntry entry = (SVNDirEntry) iterator.next(); if(log.isInfoEnabled()) { log.info("/" + (path.equals("") ? "" : path + "/") + entry.getName()+ "\n"); - info+="/" + (path.equals("") ? "" : path + "/") + entry.getName()+ "\n"; } String fichier = address+"/" + (path.equals("") ? "" : path + "/") + entry.getName(); @@ -179,10 +180,13 @@ listEntries(repository, (path.equals("")) ? entry.getName() : path + "/" + entry.getName()); } else { + // On ajoute dans la liste files seulement les fichiers et pas les répertoires - files.add(fichier); + files.add(new UrlSvnFile(fichier)); + } } + } @@ -202,6 +206,9 @@ return string; } } + - + + + } Modified: trunk/src/main/webapp/BadFileRedirect.jsp =================================================================== --- trunk/src/main/webapp/BadFileRedirect.jsp 2011-06-24 08:13:58 UTC (rev 135) +++ trunk/src/main/webapp/BadFileRedirect.jsp 2011-06-24 13:43:55 UTC (rev 136) @@ -10,14 +10,13 @@ <title>Error...</title> <link rel="icon" href="img/ScmWebEditor_little.png" type="image/png"> <link rel="stylesheet" type="text/css" href="css/main.css"> -<meta http-equiv="Refresh" content="3; url= -<%=request.getParameter("projectUrl")%>"> +<meta http-equiv="Refresh" content="3; url=<%=request.getAttribute("projectUrl")%>"> </head> <body> <a target="_blank" href="http://maven-site.nuiton.org/scmwebeditor/"><img src="img/ScmWebEditor_main.png" alt="$alt" /></a> <p>Bad SCM path or file name! Please correct it.</p> <p>You should be transferred automatically to the form page. If not -please <a href="<%=request.getParameter("projectUrl")%>">click +please <a href="<%=request.getAttribute("projectUrl")%>">click this link</a>.</p> <p>©2004-2009 CodeLutin</p> </body> Modified: trunk/src/main/webapp/Search.jsp =================================================================== --- trunk/src/main/webapp/Search.jsp 2011-06-24 08:13:58 UTC (rev 135) +++ trunk/src/main/webapp/Search.jsp 2011-06-24 13:43:55 UTC (rev 136) @@ -3,6 +3,7 @@ <%@page import="org.nuiton.scmwebeditor.actions.SearchAction"%> <%@page import="java.util.LinkedList" %> <%@page import="java.util.Iterator" %> +<%@page import="org.nuiton.scmwebeditor.UrlSvnFile" %> <%@ taglib prefix="s" uri="/struts-tags"%> <%@ taglib prefix="sj" uri="/struts-jquery-tags"%> <sj:head jquerytheme="default"/> @@ -13,15 +14,16 @@ <% SearchAction action = SearchAction.getAction(); - LinkedList<String> files = action.getFiles(); + LinkedList<UrlSvnFile> files = action.getFiles(); - Iterator<String> it = files.iterator(); + Iterator<UrlSvnFile> it = files.iterator(); while(it.hasNext()) { - String file = it.next(); + UrlSvnFile file = it.next(); + %> <tr><td> - <a href="checkout.action?address=<%=file%>&projectUrl="<%=request.getRequestURL()%>" ><%=file%></a> + <a href="checkout.action?address=<%=file%>" ><%=file+" "+file.getLevel()%></a> </td></tr> <% } %>

1 0

r135 - in trunk: . src/main/java/org/nuiton/scmwebeditor/actions
by kcardineaud＠users.nuiton.org 24 Jun '11

24 Jun '11

Author: kcardineaud Date: 2011-06-24 10:13:58 +0200 (Fri, 24 Jun 2011) New Revision: 135 Url: http://nuiton.org/repositories/revision/scmwebeditor/135 Log: ScmWebEditor use the method String generate(String xslListOrOutType, String in) for parsing rst Modified: trunk/pom.xml trunk/src/main/java/org/nuiton/scmwebeditor/actions/PreviewAction.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-06-24 08:07:02 UTC (rev 134) +++ trunk/pom.xml 2011-06-24 08:13:58 UTC (rev 135) @@ -50,7 +50,7 @@ <dependency> <groupId>org.nuiton.jrst</groupId> <artifactId>jrst</artifactId> - <version>${jrstPluginVersion}</version> + <version>1.4-SNAPSHOT</version> <scope>compile</scope> <exclusions> <exclusion> @@ -199,7 +199,7 @@ <dependency> <groupId>org.nuiton.jrst</groupId> <artifactId>doxia-module-jrst</artifactId> - <version>${jrstPluginVersion}</version> + <version>1.4-SNAPSHOT</version> </dependency> </dependencies> </plugin> Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/PreviewAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/PreviewAction.java 2011-06-24 08:07:02 UTC (rev 134) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/PreviewAction.java 2011-06-24 08:13:58 UTC (rev 135) @@ -1,14 +1,8 @@ package org.nuiton.scmwebeditor.actions; -import java.io.File; -import java.io.IOException; - - import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; -import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.struts2.interceptor.ServletRequestAware; @@ -62,31 +56,11 @@ log.debug("Enter in preview action"); } - HttpSession httpSession = request.getSession(true); - File tmpDir = getTempDir(httpSession); - //Text recuperation - String myData = newText; - //Text formating and tempfile creating - String myDataWithoutcrlf = myData.replace("\r", ""); - File fileInDirCopy = new File(tmpDir, "copy" + httpSession.getId() + ".rst"); - File httpFile = new File(tmpDir, "preview" + httpSession.getId() + ".html"); - try { - fileInDirCopy.createNewFile(); - httpFile.createNewFile(); - FileUtils.writeStringToFile(fileInDirCopy, myDataWithoutcrlf); - } catch (IOException e) { - if(log.isErrorEnabled()) { - log.error("read/write error",e); - } - } - - convertToUnicode(fileInDirCopy); - File copy = new File(tmpDir, "copy" + httpSession.getId() + ".rst"); //Using jrst for generate html document try { - JRST.generate(JRST.TYPE_HTML, copy, httpFile, JRST.Overwrite.ALLTIME); + XMLResponse = JRST.generate(JRST.TYPE_HTML, newText); if(log.isDebugEnabled()) { log.debug("RST generate"); } @@ -97,19 +71,10 @@ XMLResponse = "<h4>Parsing error, please read RST specification<h4>"; return; } - copy.delete(); + - - try { - XMLResponse = FileUtils.readFileToString(httpFile); - } catch (IOException e) { - e.printStackTrace(); - } - httpFile.delete(); - - } static public PreviewAction getAction() {

1 0

r134 - in trunk/src/main: java/org/nuiton/scmwebeditor java/org/nuiton/scmwebeditor/actions webapp
by kcardineaud＠users.nuiton.org 24 Jun '11

24 Jun '11

Author: kcardineaud Date: 2011-06-24 10:07:02 +0200 (Fri, 24 Jun 2011) New Revision: 134 Url: http://nuiton.org/repositories/revision/scmwebeditor/134 Log: ScmWebEditor delete the checkout temp dir after each action Modified: trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java trunk/src/main/webapp/ModificationViewer.jsp trunk/src/main/webapp/OutConnection.jsp Modified: trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java 2011-06-23 14:15:20 UTC (rev 133) +++ trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java 2011-06-24 08:07:02 UTC (rev 134) @@ -210,7 +210,7 @@ StringBuilder buffer = new StringBuilder(); buffer.append(svnSess.getScmEditorUrl()); buffer.append('?').append(PARAMETER_ADDRESS).append('=').append(svnSess.getSvnPath()+svnSess.getFileName()); - buffer.append("&").append(PARAMETER_PROJECT_URL).append('=').append(svnSess.getProjectUrl()); + String url = buffer.toString(); return url; Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java 2011-06-23 14:15:20 UTC (rev 133) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java 2011-06-24 08:07:02 UTC (rev 134) @@ -1,6 +1,7 @@ package org.nuiton.scmwebeditor.actions; import java.io.File; +import java.io.FileNotFoundException; import java.io.IOException; import javax.servlet.http.HttpServletRequest; @@ -17,7 +18,11 @@ import org.tmatesoft.svn.core.SVNDepth; import org.tmatesoft.svn.core.SVNException; import org.tmatesoft.svn.core.wc.SVNCommitClient; +import org.tmatesoft.svn.core.wc.SVNRevision; +import org.tmatesoft.svn.core.wc.SVNUpdateClient; + + public class ScmWebEditorCommitAction extends ScmWebEditorBaseAction implements ServletRequestAware { /** * @@ -31,6 +36,8 @@ protected String origText; protected String username; protected String pw; + protected String address; + protected String lastText; protected HttpServletRequest request; @@ -43,7 +50,6 @@ this.commitMessage = commitMessage; } - public String getNewText() { return newText; } @@ -75,7 +81,24 @@ public void setPw(String pw) { this.pw = pw; } + + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address; + } + public String getLastText() { + return lastText; + } + + public void setLastText(String lastText) { + this.lastText = lastText; + } + + public String execute() { System.setProperty("file.encoding", "UTF-8"); HttpSession httpSession = request.getSession(true); @@ -86,6 +109,75 @@ svnSess.getLogin() != null && !svnSess.getLogin().equalsIgnoreCase("") ? svnSess.getLogin() : username, svnSess.getPassword() != null && !svnSess.getPassword().equalsIgnoreCase("") ? svnSess.getPassword() : pw); + + + /* + * Checkout process + */ + SVNUpdateClient upclient = new SVNUpdateClient(svnSess.getManager(), svnSess.getSvnOption()); + + + try { + if (log.isDebugEnabled()) { + log.debug("Do Checkout of " + svnSess.getRemoteUrl()); + } + upclient.doCheckout(svnSess.getRemoteUrl(), svnSess.getCheckoutdir(), + SVNRevision.HEAD, SVNRevision.HEAD, SVNDepth.FILES, false); + } catch (SVNAuthenticationException authexep) { + request.setAttribute(PARAMETER_ADDRESS, address); + + // if svn authentication failed user is redirected on login page + if(log.isDebugEnabled()) { + log.debug("Private SCM on reading " + svnSess.getRemoteUrl()); + } + //On supprime le repertoire temporaire + delTempDirectory(svnSess); + //redirect to a login page + return "authError"; + + } catch (SVNException e) { + //Suppression du repertoire temporaire + delTempDirectory(svnSess); + return "error"; + } + lastText=newText; + + File CheckOutFile = new File(svnSess.getCheckoutdir(), svnSess.getFileName()); + try { + String originalText = FileUtils.readFileToString(CheckOutFile); + request.setAttribute(PARAMETER_FORMAT, svnSess.getFormat()); + request.setAttribute("lastText", lastText); + request.setAttribute(ATTRIBUTE_ORIG_TEXT, StringEscapeUtils.escapeHtml(originalText)); + request.setAttribute(ATTRIBUTE_INVALIDATE_MAX_TIME, (httpSession.getMaxInactiveInterval() / 60)); + request.setAttribute(ATTRIBUTE_LOGIN, (svnSess.getLogin() != null && !svnSess.getLogin().equalsIgnoreCase("") ? svnSess.getLogin() : null)); + request.setAttribute(ATTRIBUTE_IS_LOGIN, (svnSess.getLogin() != null && svnSess.getPassword() != null && !svnSess.getLogin().equalsIgnoreCase("") && !svnSess.getPassword().equalsIgnoreCase(""))); + request.setAttribute(ATTRIBUTE_PROJECT_URL, svnSess.getProjectUrl()); + request.setAttribute(PARAMETER_SCM_EDITOR_URL, svnSess.getScmEditorUrl()); + if (log.isDebugEnabled()) { + log.debug("l'url est : " + svnSess.getScmEditorUrl()); + } + request.setAttribute(ATTRIBUTE_SCM_EDITOR_URI, request.getRequestURI()); + request.setAttribute(ATTRIBUTE_PREVIEW_SERVLET_URL, request.getContextPath() + "/previewservlet"); + + // End on first part + + } catch (FileNotFoundException ee) { + /* fichier non trouve, on redirige vers BadFileRedirect.jsp + * après avoir supprimé le repertoire temporaire + */ + delTempDirectory(svnSess); + request.setAttribute(PARAMETER_SCM_EDITOR_URL, svnSess.getProjectUrl()); + return "error"; + } catch (IOException e) { + log.error("Can't find the checkout file",e); + } + + + + /* + * Commit process + */ + String originalText = StringEscapeUtils.unescapeHtml(origText); String myText = StringEscapeUtils.unescapeHtml(newText); @@ -98,7 +190,7 @@ if(log.isErrorEnabled()) { log.error("Can't write in file " , e); } - return "ko"; + return "erreur"; } @@ -108,45 +200,48 @@ tabFile[0] = pathToFile; // Sending Data to SVN - if (!myText.equals(originalText)) { - try { - if(log.isDebugEnabled()) { - log.debug("Try to commit"); - } - commitClient.doCommit(tabFile, false, "From scmwebeditor -- "+commitMessage, null, null, false, true, SVNDepth.FILES); - } catch (SVNAuthenticationException authexep) { - if(log.isErrorEnabled()) { - log.error("AUTH FAIL",authexep); - } - svnSess.setLogin(null); - svnSess.setPassword(null); - // if authentication failed edition page is reload form user's relogin - request.setAttribute(PARAMETER_FORMAT, svnSess.getFormat()); - request.setAttribute(ATTRIBUTE_ORIG_TEXT, StringEscapeUtils.escapeHtml(newText)); - request.setAttribute(ATTRIBUTE_INVALIDATE_MAX_TIME, (httpSession.getMaxInactiveInterval() / 60)); - request.setAttribute(ATTRIBUTE_LOGIN, (svnSess.getLogin() != null && !svnSess.getLogin().equalsIgnoreCase("") ? svnSess.getLogin() : null)); - request.setAttribute(ATTRIBUTE_IS_LOGIN, false); - request.setAttribute(ATTRIBUTE_PROJECT_URL, svnSess.getProjectUrl()); - request.setAttribute(PARAMETER_SCM_EDITOR_URL, svnSess.getScmEditorUrl()); - request.setAttribute(ATTRIBUTE_SCM_EDITOR_URI, request.getRequestURI()); - request.setAttribute(ATTRIBUTE_PREVIEW_SERVLET_URL, request.getContextPath() + "/previewservlet"); - - request.setAttribute(ATTRIBUTE_BAD_LOGIN, true); - return "authError"; - } catch (SVNException e) { - if(log.isErrorEnabled()) { - log.error("SVN FAIL",e); - } - //Suppression du repertoire temporaire - //delTempDirectory(svnSess); - request.setAttribute(ATTRIBUTE_REDIRECT_URL, getRedirectUrl(svnSess)); - return "erreur"; + + try { + if(log.isDebugEnabled()) { + log.debug("Try to commit"); } + commitClient.doCommit(tabFile, false, "From scmwebeditor -- "+commitMessage, null, null, false, true, SVNDepth.FILES); + } catch (SVNAuthenticationException authexep) { + if(log.isErrorEnabled()) { + log.error("AUTH FAIL"); + } + svnSess.setLogin(null); + svnSess.setPassword(null); + // if authentication failed edition page is reload form user's relogin + request.setAttribute("address", address); + request.setAttribute(PARAMETER_FORMAT, svnSess.getFormat()); + request.setAttribute(ATTRIBUTE_ORIG_TEXT, StringEscapeUtils.escapeHtml(newText)); + request.setAttribute(ATTRIBUTE_INVALIDATE_MAX_TIME, (httpSession.getMaxInactiveInterval() / 60)); + request.setAttribute(ATTRIBUTE_LOGIN, (svnSess.getLogin() != null && !svnSess.getLogin().equalsIgnoreCase("") ? svnSess.getLogin() : null)); + request.setAttribute(ATTRIBUTE_IS_LOGIN, false); + request.setAttribute(ATTRIBUTE_PROJECT_URL, svnSess.getProjectUrl()); + request.setAttribute(PARAMETER_SCM_EDITOR_URL, svnSess.getScmEditorUrl()); + request.setAttribute(ATTRIBUTE_SCM_EDITOR_URI, request.getRequestURI()); + request.setAttribute(ATTRIBUTE_PREVIEW_SERVLET_URL, request.getContextPath() + "/previewservlet"); + + request.setAttribute(ATTRIBUTE_BAD_LOGIN, true); + //Suppression du repertoire temporaire + delTempDirectory(svnSess); + return "authError"; + } catch (SVNException e) { + if(log.isErrorEnabled()) { + log.error("SVN FAIL",e); + } + //Suppression du repertoire temporaire + delTempDirectory(svnSess); + request.setAttribute(ATTRIBUTE_REDIRECT_URL, getRedirectUrl(svnSess)); + return "erreur"; } + if (svnSess.getCheckoutdir() != null) { //Suppression du repertoire temporaire - //delTempDirectory(svnSess); + delTempDirectory(svnSess); } //if commit success user is redirect on the project page request.setAttribute(ATTRIBUTE_REDIRECTION_URL, svnSess.getProjectUrl()); @@ -155,7 +250,7 @@ log.debug("End of commit"); } //Suppression du repertoire temporaire - //delTempDirectory(svnSess); + delTempDirectory(svnSess); return "success"; } Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java 2011-06-23 14:15:20 UTC (rev 133) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java 2011-06-24 08:07:02 UTC (rev 134) @@ -21,6 +21,8 @@ import org.tmatesoft.svn.core.wc.SVNRevision; import org.tmatesoft.svn.core.wc.SVNUpdateClient; +import com.opensymphony.xwork2.Action; + public class ScmWebEditorMainAction extends ScmWebEditorBaseAction implements ServletRequestAware { /** @@ -178,9 +180,10 @@ if(log.isDebugEnabled()) { log.debug("Private SCM on reading " + svnSess.getRemoteUrl()); } - + //On supprime le repertoire temporaire + delTempDirectory(svnSess); //redirect to a login page - return "login"; + return Action.LOGIN; } catch (SVNException e) { //Suppression du repertoire temporaire @@ -218,6 +221,8 @@ log.error("Can't find the checkout file",e); } + //On supprime le repertoire temporaire + delTempDirectory(svnSess); return "editPage"; Modified: trunk/src/main/webapp/ModificationViewer.jsp =================================================================== --- trunk/src/main/webapp/ModificationViewer.jsp 2011-06-23 14:15:20 UTC (rev 133) +++ trunk/src/main/webapp/ModificationViewer.jsp 2011-06-24 08:07:02 UTC (rev 134) @@ -21,7 +21,11 @@ <center> <form method="post" action=commit.action id="editForm"> <script src="GereFormSize.js" type="text/javascript"></script> - <textarea name="newText" id="newText"><%=request.getAttribute("OrigText")%></textarea> + <% if(request.getAttribute("lastText")!=null) { %> + <textarea name="newText" id="newText"><%=request.getAttribute("lastText")%></textarea> + <% } else { %> + <textarea name="newText" id="newText"><%=request.getAttribute("OrigText")%></textarea> + <% } %> <script src="GereSession.js" type="text/javascript"></script> <script src="cancelRedirectDelete.js" type="text/javascript"></script> <script src="pictureUpload.js" type="text/javascript"></script> @@ -50,10 +54,13 @@ <input type="hidden" NAME=username /> <input type="hidden" NAME=pw /><% }%> + <input type="hidden" name="address" value="<%=request.getAttribute("address")%>"/> <input type="hidden" name="origText" value="<%=request.getAttribute("OrigText")%>"/> + <% if(request.getAttribute("lastText")!=null) { %> + <input type="hidden" name="lastText" value="<%=request.getAttribute("lastText")%>" /> + <% } %> <input type="hidden" name="scmEditorUrl" value="<%=request.getAttribute("scmEditorUrl")%>"/> - <input type="hidden" name="previewServletUrl" value="<%=request.getAttribute("previewServletUrl")%>"/> - + <s:url id="ajaxCommit" value="save.action" /> <sj:submit Modified: trunk/src/main/webapp/OutConnection.jsp =================================================================== --- trunk/src/main/webapp/OutConnection.jsp 2011-06-23 14:15:20 UTC (rev 133) +++ trunk/src/main/webapp/OutConnection.jsp 2011-06-24 08:07:02 UTC (rev 134) @@ -45,10 +45,6 @@ <input type="submit" name="Save" /> </p> - - - - <div id="htmlcontentSearch" ></div> </form> </center>

1 0

r133 - in trunk/src/main: java/org/nuiton/scmwebeditor/actions resources webapp
by kcardineaud＠users.nuiton.org 23 Jun '11

23 Jun '11

Author: kcardineaud Date: 2011-06-23 16:15:20 +0200 (Thu, 23 Jun 2011) New Revision: 133 Url: http://nuiton.org/repositories/revision/scmwebeditor/133 Log: Add the upload file function Added: trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java trunk/src/main/webapp/uploadForm.jsp trunk/src/main/webapp/uploadSuccess.jsp Modified: trunk/src/main/resources/struts.xml trunk/src/main/webapp/ModificationViewer.jsp trunk/src/main/webapp/accueil.jsp trunk/src/main/webapp/pictureUpload.js Added: trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java (rev 0) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/UploadAction.java 2011-06-23 14:15:20 UTC (rev 133) @@ -0,0 +1,143 @@ +package org.nuiton.scmwebeditor.actions; + +import java.io.File; +import java.io.IOException; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; + +import org.apache.commons.io.FileUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.struts2.interceptor.ServletRequestAware; +import org.nuiton.scmwebeditor.ScmWebEditorBaseAction; +import org.nuiton.scmwebeditor.SvnSession; +import org.tmatesoft.svn.core.SVNAuthenticationException; +import org.tmatesoft.svn.core.SVNDepth; +import org.tmatesoft.svn.core.SVNException; +import org.tmatesoft.svn.core.wc.SVNClientManager; + +import com.opensymphony.xwork2.Action; + +public class UploadAction extends ScmWebEditorBaseAction implements ServletRequestAware { + + /** + * + */ + private static final long serialVersionUID = 4244339447567114412L; + private static final Log log = LogFactory.getLog(UploadAction.class); + protected File upload; + protected String uploadFileName; + protected String uploadContentType; + protected String username; + protected String pw; + protected String svnPath; + + protected HttpServletRequest request; + + + public String getSvnPath() { + return svnPath; + } + public void setSvnPath(String svnPath) { + this.svnPath = svnPath; + } + public File getUpload() { + return upload; + } + public void setUpload(File upload) { + this.upload = upload; + } + public String getUploadContentType() { + return uploadContentType; + } + public void setUploadContentType(String uploadContentType) { + this.uploadContentType = uploadContentType; + } + public String getUploadFileName() { + return uploadFileName; + } + public void setUploadFileName(String uploadFileName) { + this.uploadFileName = uploadFileName; + } + public String getUsername() { + return username; + } + public void setUsername(String username) { + this.username = username; + } + public String getPw() { + return pw; + } + public void setPw(String pw) { + this.pw = pw; + } + + + public String execute() { + + if(log.isInfoEnabled()) { + log.info("PictureName : "+uploadFileName); + log.info("ContentType : "+uploadContentType); + } + + + + + HttpSession httpSession = request.getSession(true); + SvnSession svnSess = getSvnSession(httpSession); + + File checkoutDir = svnSess.getCheckoutdir(); + + String checkoutPath = checkoutDir.getAbsolutePath(); + File file = new File(checkoutPath,uploadFileName); + + + try { + FileUtils.copyFile(upload, file); + } catch (IOException e) { + log.error("Can't copy the file to the checkout directory",e); + } + + +// Resetting authentification information and manager + svnSess.updateAuthentication( + svnSess.getLogin() != null && !svnSess.getLogin().equalsIgnoreCase("") ? svnSess.getLogin() : username, + svnSess.getPassword() != null && !svnSess.getPassword().equalsIgnoreCase("") ? svnSess.getPassword() : pw); + + + + SVNClientManager manager = svnSess.getManager(); + + File[] tabFile = new File[1]; + tabFile[0] = file; + + try { + //On ajoute l'image aux fichiers versionnés + manager.getWCClient().doAdd( file , false , false , false , SVNDepth.FILES, false, false ); + //On commit la modification + manager.getCommitClient().doCommit(tabFile, false, "From scmwebeditor -- add the file : "+uploadFileName, null, null, false, true, SVNDepth.FILES); + } catch (SVNAuthenticationException authexep) { + log.error("authentification fail"); + request.setAttribute(ATTRIBUTE_BAD_LOGIN, true); + return Action.LOGIN; + } + catch (SVNException e) { + log.error("Erreur SVN",e); + request.setAttribute("error", true); + return Action.ERROR; + } + + + return Action.SUCCESS; + } + + + @Override + public void setServletRequest(HttpServletRequest request) { + this.request=request; + } + + + +} Modified: trunk/src/main/resources/struts.xml =================================================================== --- trunk/src/main/resources/struts.xml 2011-06-22 15:16:18 UTC (rev 132) +++ trunk/src/main/resources/struts.xml 2011-06-23 14:15:20 UTC (rev 133) @@ -11,20 +11,31 @@ <result name="erreurPath" >/BadFileRedirect.jsp</result> <result name="editPage" >/ModificationViewer.jsp</result> </action> + <action name="commit" class="org.nuiton.scmwebeditor.actions.ScmWebEditorCommitAction" method="execute"> <result name="success" >/Redirect.jsp</result> <result name="authError" >/ModificationViewer.jsp</result> <result name="erreur">/BadFileRedirect.jsp</result> </action> + <action name="save" class="org.nuiton.scmwebeditor.actions.SaveAction" method="save"> <result>/Save.jsp</result> </action> + + <action name="doUpload" class="org.nuiton.scmwebeditor.actions.UploadAction" method="execute"> + <result>/uploadSuccess.jsp</result> + <result name="login" >/uploadForm.jsp</result> + <result name="error" >/uploadForm.jsp</result> + </action> + <action name="preview" class="org.nuiton.scmwebeditor.actions.PreviewAction" method="execute"> <result>/Preview.jsp</result> </action> + <action name="search" class="org.nuiton.scmwebeditor.actions.SearchAction" method="search"> <result>/Search.jsp</result> <result name="authError" >/LoginSearch.jsp</result> </action> + </package> </struts> \ No newline at end of file Modified: trunk/src/main/webapp/ModificationViewer.jsp =================================================================== --- trunk/src/main/webapp/ModificationViewer.jsp 2011-06-22 15:16:18 UTC (rev 132) +++ trunk/src/main/webapp/ModificationViewer.jsp 2011-06-23 14:15:20 UTC (rev 133) @@ -93,11 +93,35 @@ <input title="Exit ScmWebEditor without saving." type="button" value="Exit" name="Cancel" onclick="javascript:cancelRedirectDelete(this.form.origText, this.form.username, this.form.pw, this.form.commitMessage, this.form.ProjectUrl, this.form.scmEditorUrl);"/> </form> - - - - + + <button onClick="javascript:upload_popup('uploadForm.jsp','upload');" >Upload</button> + +  + + <sj:div id="htmlcontentUpload"></sj:div> </center> + <div id="htmlcontentPreview"></div> <p align="right">©2004-2009 CodeLutin</p> Modified: trunk/src/main/webapp/accueil.jsp =================================================================== --- trunk/src/main/webapp/accueil.jsp 2011-06-22 15:16:18 UTC (rev 132) +++ trunk/src/main/webapp/accueil.jsp 2011-06-23 14:15:20 UTC (rev 133) @@ -1,9 +1,3 @@ <%@ page contentType="text/html; charset=UTF-8" %> -<html> - <head> - </head> - <body> <p>Parametres detectés</p> - </body> -</html> \ No newline at end of file Modified: trunk/src/main/webapp/pictureUpload.js =================================================================== --- trunk/src/main/webapp/pictureUpload.js 2011-06-22 15:16:18 UTC (rev 132) +++ trunk/src/main/webapp/pictureUpload.js 2011-06-23 14:15:20 UTC (rev 133) @@ -0,0 +1,4 @@ +function upload_popup(page, name) +{ +window.open (page, name, config='top=300, left=300, height=300, width=500, toolbar=no, menubar=no, scrollbars=yes, resizable=yes, location=no, directories=no, status=no') +} \ No newline at end of file Added: trunk/src/main/webapp/uploadForm.jsp =================================================================== --- trunk/src/main/webapp/uploadForm.jsp (rev 0) +++ trunk/src/main/webapp/uploadForm.jsp 2011-06-23 14:15:20 UTC (rev 133) @@ -0,0 +1,34 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> +<html> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> +<title>UploadFile</title> +</head> +<body> + + <form method="POST" id="uploadForm" action="doUpload" enctype="multipart/form-data"> + <label>Upload a picture : <input type="file" name="upload"/></label><br/> + <label>Path on svn : <input type="text" name="svnPath" /></label><br/> + <label>username : <input type="text" name="username" /></label><br/> + <label>password : <input type="password" name="pw" /></label><br/> + <%if (request.getAttribute("badLogin")!=null && request.getAttribute("badLogin").equals(true)) { %> + <p> + <font color="red"> + Bad username or password + </font> + </p> + <% } %> + <%if (request.getAttribute("error")!=null && request.getAttribute("error").equals(true)) { %> + <p> + <font color="red"> + Erreur SVN + </font> + </p> + <% } %> + <input type="submit"/> + </form> + +</body> +</html> \ No newline at end of file Added: trunk/src/main/webapp/uploadSuccess.jsp =================================================================== --- trunk/src/main/webapp/uploadSuccess.jsp (rev 0) +++ trunk/src/main/webapp/uploadSuccess.jsp 2011-06-23 14:15:20 UTC (rev 133) @@ -0,0 +1,15 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> +<html> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> +<title>Success</title> +</head> +<body> +<p>File upload successful</p> + <form> + <input type="button" value="close" onclick="window.close()"> + </form> +</body> +</html> \ No newline at end of file

1 0

r132 - in trunk/src/main: java/org/nuiton/scmwebeditor java/org/nuiton/scmwebeditor/actions resources webapp webapp/css
by kcardineaud＠users.nuiton.org 22 Jun '11

22 Jun '11

Author: kcardineaud Date: 2011-06-22 17:16:18 +0200 (Wed, 22 Jun 2011) New Revision: 132 Url: http://nuiton.org/repositories/revision/scmwebeditor/132 Log: ScmWebEditor can now be use with read/write private SVN Added: trunk/src/main/webapp/LoginSearch.jsp Modified: trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java trunk/src/main/java/org/nuiton/scmwebeditor/actions/SearchAction.java trunk/src/main/resources/struts.xml trunk/src/main/webapp/ModificationViewer.jsp trunk/src/main/webapp/OutConnection.jsp trunk/src/main/webapp/PrivateSvnRedirect.jsp trunk/src/main/webapp/Search.jsp trunk/src/main/webapp/css/main.css Modified: trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java 2011-06-22 12:46:07 UTC (rev 131) +++ trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java 2011-06-22 15:16:18 UTC (rev 132) @@ -51,7 +51,7 @@ private static final Log log = LogFactory.getLog(ScmWebEditorBaseAction.class); //TODO-TC200924 : uniformize all this different parameter and attribute, this is a bit messy... - protected static final String PARAMETER_ADRESSE = "address"; + protected static final String PARAMETER_ADDRESS = "address"; protected static final String PARAMETER_SCM_EDITOR_URL = "scmEditorUrl"; protected static final String PARAMETER_PROJECT_URL = "projectUrl"; protected static final String PARAMETER_FILE_NAME = "file_name"; @@ -209,7 +209,7 @@ protected String getRedirectUrl(SvnSession svnSess) { StringBuilder buffer = new StringBuilder(); buffer.append(svnSess.getScmEditorUrl()); - buffer.append('?').append(PARAMETER_ADRESSE).append('=').append(svnSess.getSvnPath()+svnSess.getFileName()); + buffer.append('?').append(PARAMETER_ADDRESS).append('=').append(svnSess.getSvnPath()+svnSess.getFileName()); buffer.append("&").append(PARAMETER_PROJECT_URL).append('=').append(svnSess.getProjectUrl()); String url = buffer.toString(); Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java 2011-06-22 12:46:07 UTC (rev 131) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java 2011-06-22 15:16:18 UTC (rev 132) @@ -34,10 +34,33 @@ protected String projectUrl; protected String format; + + protected String username; + protected String pw; + protected HttpServletRequest request; + public String getUsername() { + return username; + } + + + public void setUsername(String username) { + this.username = username; + } + + + public String getPw() { + return pw; + } + + + public void setPw(String pw) { + this.pw = pw; + } + public String getAddress() { return address; } @@ -104,30 +127,33 @@ //SvnSession object creation if doesn't already exist SvnSession svnSess = getSvnSession(httpSession); + String relativePath = address.substring(0,address.lastIndexOf("/")); String scmFileName = address.substring(address.lastIndexOf("/")+1); + format = scmFileName.substring(scmFileName.lastIndexOf(".")+1); + + String tmp_log = null; String tmp_pass = null; - if (svnSess != null) { - tmp_log = svnSess.getLogin(); - tmp_pass = svnSess.getPassword(); - } - svnSess = new SvnSession( - relativePath, - scmFileName, - projectUrl, - tmp_log, - tmp_pass, - httpSession.getId(), - format, - request.getRequestURL()); - - + svnSess = new SvnSession( + relativePath, + scmFileName, + projectUrl, + tmp_log, + tmp_pass, + httpSession.getId(), + format, + request.getRequestURL()); + + svnSess.updateAuthentication( + svnSess.getLogin() != null && !svnSess.getLogin().equalsIgnoreCase("") ? svnSess.getLogin() : username, + svnSess.getPassword() != null && !svnSess.getPassword().equalsIgnoreCase("") ? svnSess.getPassword() : pw); + setSvnSession(httpSession, svnSess); // Tempdir creation on servlet default temporary directory @@ -146,12 +172,13 @@ upclient.doCheckout(svnSess.getRemoteUrl(), svnSess.getCheckoutdir(), SVNRevision.HEAD, SVNRevision.HEAD, SVNDepth.FILES, false); } catch (SVNAuthenticationException authexep) { + request.setAttribute(PARAMETER_ADDRESS, address); + // if svn authentication failed user is redirected on login page if(log.isDebugEnabled()) { log.debug("Private SCM on reading " + svnSess.getRemoteUrl()); } - //Suppression du repertoire temporaire - delTempDirectory(svnSess); + //redirect to a login page return "login"; Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/SearchAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/SearchAction.java 2011-06-22 12:46:07 UTC (rev 131) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/SearchAction.java 2011-06-22 15:16:18 UTC (rev 132) @@ -1,13 +1,13 @@ package org.nuiton.scmwebeditor.actions; import java.util.Collection; -import java.util.Collections; import java.util.Iterator; import java.util.LinkedList; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.scmwebeditor.ScmWebEditorBaseAction; +import org.tmatesoft.svn.core.SVNAuthenticationException; import org.tmatesoft.svn.core.SVNDirEntry; import org.tmatesoft.svn.core.SVNException; import org.tmatesoft.svn.core.SVNNodeKind; @@ -37,11 +37,15 @@ String address; LinkedList<String> files; - + String username; + String pw; + + String info; String list; + public String getList() { return list; } @@ -71,22 +75,41 @@ this.address = address; } - - public String execute() { - search(); - return Action.SUCCESS; + public String getUsername() { + return username; } - - - public void search() { + + + public void setUsername(String username) { + this.username = username; + } + + + public String getPw() { + return pw; + } + + + public void setPw(String pw) { + this.pw = pw; + } + + + public String search() { DAVRepositoryFactory.setup(); String url = address; + String name = "anonymous"; String password="anonymous"; + if(username!=null && pw!=null) { + name = username; + password=pw; + } + files = new LinkedList<String>(); @@ -111,26 +134,36 @@ if(log.isErrorEnabled()) { log.error( "There is no entry at '" + url + "'." ); } - return; + return Action.SUCCESS; } else if ( nodeKind == SVNNodeKind.FILE ) { if(log.isErrorEnabled()) { log.error( "The entry at '" + url + "' is a file while a directory was expected." ); } - return; + return Action.SUCCESS; } listEntries( repository , "" ); - } catch ( Exception svne ) { + } catch (SVNAuthenticationException authexep) { + return "authError"; + } + catch ( SVNException svne ) { log.error("Can't access to the repository",svne); } + return Action.SUCCESS; } - public void listEntries( SVNRepository repository, String path ) throws SVNException { - Collection<?> entries = repository.getDir( path, -1 , null , (Collection<?>) null ); + public void listEntries( SVNRepository repository, String path ) { + Collection<?> entries = null; + try { + entries = repository.getDir( path, -1 , null , (Collection<?>) null ); + } catch (SVNException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } Iterator<?> iterator = entries.iterator(); while (iterator.hasNext()) { Modified: trunk/src/main/resources/struts.xml =================================================================== --- trunk/src/main/resources/struts.xml 2011-06-22 12:46:07 UTC (rev 131) +++ trunk/src/main/resources/struts.xml 2011-06-22 15:16:18 UTC (rev 132) @@ -22,8 +22,9 @@ <action name="preview" class="org.nuiton.scmwebeditor.actions.PreviewAction" method="execute"> <result>/Preview.jsp</result> </action> - <action name="search" class="org.nuiton.scmwebeditor.actions.SearchAction" method="execute"> + <action name="search" class="org.nuiton.scmwebeditor.actions.SearchAction" method="search"> <result>/Search.jsp</result> + <result name="authError" >/LoginSearch.jsp</result> </action> </package> </struts> \ No newline at end of file Added: trunk/src/main/webapp/LoginSearch.jsp =================================================================== --- trunk/src/main/webapp/LoginSearch.jsp (rev 0) +++ trunk/src/main/webapp/LoginSearch.jsp 2011-06-22 15:16:18 UTC (rev 132) @@ -0,0 +1,28 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> + <%@ taglib prefix="s" uri="/struts-tags"%> + <%@ taglib prefix="sj" uri="/struts-jquery-tags"%> + <sj:head jquerytheme="default"/> + +<div id="search"> + <p>You must be login to see this repository.</p> + <p> + <label>Username : <input type="text" name="username"></input></label><br/> + <label>Password : <input type ="password" name="pw"></input></label><br/> + + <s:url id="ajaxSearchLogin" value="search.action" /> + + <sj:submit + id="ajaxSearchButtonLogin" + formIds="configForm" + targets="htmlcontentSearch" + href="%{ajaxSearchLogin}" + indicator="indicator" + button="true" + buttonIcon="ui-icon-refresh" + value="Login" + > + </sj:submit> + </p> +</div> \ No newline at end of file Modified: trunk/src/main/webapp/ModificationViewer.jsp =================================================================== --- trunk/src/main/webapp/ModificationViewer.jsp 2011-06-22 12:46:07 UTC (rev 131) +++ trunk/src/main/webapp/ModificationViewer.jsp 2011-06-22 15:16:18 UTC (rev 132) @@ -88,20 +88,15 @@ <%}%> - <input title="Reset text as current repository HEAD revision." type="reset" value="Reset" name="Reset" alt="Test plop plop plop"/> + <input title="Reset text as current repository HEAD revision." type="reset" value="Reset" name="Reset" /> <input type="hidden" value="<%=request.getAttribute("ProjectUrl")%>" name="ProjectUrl"> <input title="Exit ScmWebEditor without saving." type="button" value="Exit" name="Cancel" onclick="javascript:cancelRedirectDelete(this.form.origText, this.form.username, this.form.pw, this.form.commitMessage, this.form.ProjectUrl, this.form.scmEditorUrl);"/> - - - - </form> - + - - - + + </center> <div id="htmlcontentPreview"></div> Modified: trunk/src/main/webapp/OutConnection.jsp =================================================================== --- trunk/src/main/webapp/OutConnection.jsp 2011-06-22 12:46:07 UTC (rev 131) +++ trunk/src/main/webapp/OutConnection.jsp 2011-06-22 15:16:18 UTC (rev 132) @@ -42,12 +42,15 @@ > </sj:submit> + <input type="submit" name="Save" /> </p> + + + + <div id="htmlcontentSearch" ></div> - -<input type="hidden" name="projectUrl" value="<%=request.getHeader("referer")%>" /> -<input type="submit" name="Save" /></form> +</form> </center> <p align="right">©2004-2009 CodeLutin</p> </body> Modified: trunk/src/main/webapp/PrivateSvnRedirect.jsp =================================================================== --- trunk/src/main/webapp/PrivateSvnRedirect.jsp 2011-06-22 12:46:07 UTC (rev 131) +++ trunk/src/main/webapp/PrivateSvnRedirect.jsp 2011-06-22 15:16:18 UTC (rev 132) @@ -14,6 +14,8 @@ <body> <a target="_blank" href="http://maven-site.nuiton.org/scmwebeditor/"><img src="img/ScmWebEditor_main.png" alt="$alt" /></a> <form method="post" action="checkout.action" > +<input type="hidden" name="address" value="<%=request.getAttribute("address")%>"/> +<input type="hidden" name="projectUrl" value="<%=request.getAttribute("projectUrl")%>"/> <script src="cancelRedirect.js"></script> <p>You try to access a Private SCM. Please login</p> <p><label ACCESSKEY=U>User name: <input TYPE=text Modified: trunk/src/main/webapp/Search.jsp =================================================================== --- trunk/src/main/webapp/Search.jsp 2011-06-22 12:46:07 UTC (rev 131) +++ trunk/src/main/webapp/Search.jsp 2011-06-22 15:16:18 UTC (rev 132) @@ -7,21 +7,24 @@ <%@ taglib prefix="sj" uri="/struts-jquery-tags"%> <sj:head jquerytheme="default"/> -<table> - <% - SearchAction action = SearchAction.getAction(); - - LinkedList<String> files = action.getFiles(); - - Iterator<String> it = files.iterator(); - - while(it.hasNext()) { - String file = it.next(); - %> - <tr><td> - <a href="checkout.action?address=<%=file%>&projectUrl="<%=request.getRequestURL()%>" ><%=file%></a> +<div id="search"> +<p>Files in the SVN repository : </p> + <table> + <% + SearchAction action = SearchAction.getAction(); + + LinkedList<String> files = action.getFiles(); - </td></tr> - <% } %> - -</table> \ No newline at end of file + Iterator<String> it = files.iterator(); + + while(it.hasNext()) { + String file = it.next(); + %> + <tr><td> + <a href="checkout.action?address=<%=file%>&projectUrl="<%=request.getRequestURL()%>" ><%=file%></a> + + </td></tr> + <% } %> + + </table> +</div> \ No newline at end of file Modified: trunk/src/main/webapp/css/main.css =================================================================== --- trunk/src/main/webapp/css/main.css 2011-06-22 12:46:07 UTC (rev 131) +++ trunk/src/main/webapp/css/main.css 2011-06-22 15:16:18 UTC (rev 132) @@ -23,3 +23,9 @@ border : solid 3px black; } +#search { + width:30%; + margin:auto; + display:block; + border : solid 2px black; +}

1 0

r131 - in trunk/src/main: java/org/nuiton/scmwebeditor java/org/nuiton/scmwebeditor/actions resources webapp
by kcardineaud＠users.nuiton.org 22 Jun '11

22 Jun '11

Author: kcardineaud Date: 2011-06-22 14:46:07 +0200 (Wed, 22 Jun 2011) New Revision: 131 Url: http://nuiton.org/repositories/revision/scmwebeditor/131 Log: Add a search function Added: trunk/src/main/java/org/nuiton/scmwebeditor/actions/SearchAction.java trunk/src/main/webapp/Search.jsp Removed: trunk/src/main/java/org/nuiton/scmwebeditor/SearchServlet.java Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java trunk/src/main/resources/log4j.properties trunk/src/main/resources/struts.xml trunk/src/main/webapp/BadFileRedirect.jsp trunk/src/main/webapp/OutConnection.jsp trunk/src/main/webapp/Save.jsp Deleted: trunk/src/main/java/org/nuiton/scmwebeditor/SearchServlet.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/SearchServlet.java 2011-06-21 12:56:58 UTC (rev 130) +++ trunk/src/main/java/org/nuiton/scmwebeditor/SearchServlet.java 2011-06-22 12:46:07 UTC (rev 131) @@ -1,101 +0,0 @@ -/* - * #%L - * Nuiton-ScmWebEditor - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2010 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ -package org.nuiton.scmwebeditor; - -import java.util.logging.Level; -import java.util.logging.Logger; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.tmatesoft.svn.core.ISVNDirEntryHandler; -import org.tmatesoft.svn.core.SVNDirEntry; -import org.tmatesoft.svn.core.SVNException; -import org.tmatesoft.svn.core.SVNURL; -import org.tmatesoft.svn.core.auth.ISVNAuthenticationManager; -import org.tmatesoft.svn.core.internal.wc.DefaultSVNOptions; -import org.tmatesoft.svn.core.wc.ISVNRepositoryPool; -import org.tmatesoft.svn.core.wc.SVNClientManager; -import org.tmatesoft.svn.core.wc.SVNLogClient; -import org.tmatesoft.svn.core.wc.SVNRevision; -import org.tmatesoft.svn.core.wc.SVNWCUtil; - -public class SearchServlet extends ScmWebEditorBaseAction { - - /** - * - */ - private static final long serialVersionUID = 8229295563440910960L; - private static final Log log = LogFactory.getLog(SearchServlet.class); - - /** - * Handles the HTTP <code>POST</code> method. - * Search files list on scm repository - * - * @param request servlet request - * @param response servlet response - * @throws ServletException if a servlet-specific error occurs - */ - - protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException { - try { - String adresse = request.getParameter(PARAMETER_ADRESSE); - if (log.isDebugEnabled()) { - log.debug("Search for files on " + adresse + " repository"); - } - //Create default access - DefaultSVNOptions svnOption = SVNWCUtil.createDefaultOptions(false); - ISVNAuthenticationManager authManager = SVNWCUtil.createDefaultAuthenticationManager(); - log.debug("Authentication manager and svnOption created"); - //Convert url to SVNUrl - SVNURL svnUrl = SVNURL.parseURIEncoded(adresse); - log.debug("Svn url created"); - // create a SVNRepositoryPool - SVNClientManager plop = SVNClientManager.newInstance(svnOption, authManager); - ISVNRepositoryPool pool = plop.getRepositoryPool(); - //get a SVNLogClient - SVNLogClient logClient = new SVNLogClient(pool, svnOption); - log.debug("LogClient Created"); - //recup info about svn repository - ISVNDirEntryHandler dirEntryHandler = new ISVNDirEntryHandler() { - @Override - public void handleDirEntry(SVNDirEntry dirEntry) throws SVNException { - log.debug("Handle dirEntries"); - log.debug("le fichier est: " + dirEntry.getName()); - throw new UnsupportedOperationException("Not supported yet."); - } - }; - log.debug("Begin handle listEntries"); - logClient.doList(svnUrl, SVNRevision.WORKING, SVNRevision.HEAD, true, true, dirEntryHandler); - log.debug("List handle"); - } catch (SVNException ex) { - response.setStatus(401); - Logger.getLogger(SearchServlet.class.getName()).log(Level.SEVERE, null, ex); - } - - - } -} \ No newline at end of file Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java 2011-06-21 12:56:58 UTC (rev 130) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java 2011-06-22 12:46:07 UTC (rev 131) @@ -93,6 +93,11 @@ return "noParameter"; } + if(log.isInfoEnabled()) { + log.info("ProjectUrl= "+request.getHeader("referer")); + } + projectUrl=request.getHeader("referer"); + HttpSession httpSession = request.getSession(true); System.setProperty("file.encoding", "UTF-8"); Added: trunk/src/main/java/org/nuiton/scmwebeditor/actions/SearchAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/SearchAction.java (rev 0) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/SearchAction.java 2011-06-22 12:46:07 UTC (rev 131) @@ -0,0 +1,174 @@ +package org.nuiton.scmwebeditor.actions; + +import java.util.Collection; +import java.util.Collections; +import java.util.Iterator; +import java.util.LinkedList; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.scmwebeditor.ScmWebEditorBaseAction; +import org.tmatesoft.svn.core.SVNDirEntry; +import org.tmatesoft.svn.core.SVNException; +import org.tmatesoft.svn.core.SVNNodeKind; +import org.tmatesoft.svn.core.SVNURL; +import org.tmatesoft.svn.core.auth.ISVNAuthenticationManager; +import org.tmatesoft.svn.core.internal.io.dav.DAVRepositoryFactory; + +import org.tmatesoft.svn.core.io.SVNRepository; +import org.tmatesoft.svn.core.io.SVNRepositoryFactory; + +import org.tmatesoft.svn.core.wc.SVNWCUtil; + +import com.opensymphony.xwork2.Action; +import com.opensymphony.xwork2.ActionContext; + + +public class SearchAction extends ScmWebEditorBaseAction { + + /** + * + */ + private static final long serialVersionUID = 4432027215087932750L; + + + private static final Log log = LogFactory.getLog(SearchAction.class); + + + String address; + LinkedList<String> files; + + String info; + + String list; + + public String getList() { + return list; + } + + + public void setList(String list) { + this.list = list; + } + + + public LinkedList<String> getFiles() { + return files; + } + + + public String getInfo() { + return info; + } + + + public String getAddress() { + return address; + } + + + public void setAddress(String address) { + this.address = address; + } + + + public String execute() { + search(); + return Action.SUCCESS; + } + + + public void search() { + + DAVRepositoryFactory.setup(); + + String url = address; + + String name = "anonymous"; + String password="anonymous"; + + files = new LinkedList<String>(); + + + if(address.endsWith("/")) { + address = address.substring(0, address.length()-1); + } + + + SVNRepository repository = null; + try { + repository = SVNRepositoryFactory.create( SVNURL.parseURIDecoded( url ) ); + ISVNAuthenticationManager authManager = SVNWCUtil.createDefaultAuthenticationManager( name , password ); + repository.setAuthenticationManager( authManager ); + + if(log.isInfoEnabled()) { + log.info( "Repository Root: " + repository.getRepositoryRoot( true ) ); + log.info( "Repository UUID: " + repository.getRepositoryUUID( true ) ); + } + + SVNNodeKind nodeKind = repository.checkPath( "" , -1 ); + if ( nodeKind == SVNNodeKind.NONE ) { + if(log.isErrorEnabled()) { + log.error( "There is no entry at '" + url + "'." ); + } + return; + } else if ( nodeKind == SVNNodeKind.FILE ) { + if(log.isErrorEnabled()) { + log.error( "The entry at '" + url + "' is a file while a directory was expected." ); + } + return; + } + + listEntries( repository , "" ); + + + } catch ( Exception svne ) { + log.error("Can't access to the repository",svne); + } + + } + + + public void listEntries( SVNRepository repository, String path ) throws SVNException { + Collection<?> entries = repository.getDir( path, -1 , null , (Collection<?>) null ); + Iterator<?> iterator = entries.iterator(); + + while (iterator.hasNext()) { + SVNDirEntry entry = (SVNDirEntry) iterator.next(); + if(log.isInfoEnabled()) { + log.info("/" + (path.equals("") ? "" : path + "/") + entry.getName()+ "\n"); + info+="/" + (path.equals("") ? "" : path + "/") + entry.getName()+ "\n"; + } + String fichier = address+"/" + (path.equals("") ? "" : path + "/") + entry.getName(); + + + if ( entry.getKind() == SVNNodeKind.DIR ) { + listEntries(repository, (path.equals("")) ? entry.getName() : path + "/" + entry.getName()); + } + else { + // On ajoute dans la liste files seulement les fichiers et pas les répertoires + files.add(fichier); + } + } + + } + + + static public SearchAction getAction() { + return (SearchAction) ActionContext.getContext() + .get(CONTEXT_ACTION_KEY); + } + + public static String replaceLast(String string, String toReplace, String replacement) { + int pos = string.lastIndexOf(toReplace); + if (pos > -1) { + return string.substring(0, pos) + + replacement + + string.substring(pos + toReplace.length(), string.length()); + } else { + return string; + } + } + + +} Modified: trunk/src/main/resources/log4j.properties =================================================================== --- trunk/src/main/resources/log4j.properties 2011-06-21 12:56:58 UTC (rev 130) +++ trunk/src/main/resources/log4j.properties 2011-06-22 12:46:07 UTC (rev 131) @@ -1,5 +1,5 @@ # Global logging configuration -log4j.rootLogger=DEBUG, stdout +log4j.rootLogger=INFO, stdout # Console output... log4j.appender.stdout=org.apache.log4j.ConsoleAppender Modified: trunk/src/main/resources/struts.xml =================================================================== --- trunk/src/main/resources/struts.xml 2011-06-21 12:56:58 UTC (rev 130) +++ trunk/src/main/resources/struts.xml 2011-06-22 12:46:07 UTC (rev 131) @@ -23,10 +23,7 @@ <result>/Preview.jsp</result> </action> <action name="search" class="org.nuiton.scmwebeditor.actions.SearchAction" method="execute"> - <result type="stream" > - <param name="contentType">text/xml</param> - <param name="inputName">XMLResponse</param> - </result> + <result>/Search.jsp</result> </action> </package> </struts> \ No newline at end of file Modified: trunk/src/main/webapp/BadFileRedirect.jsp =================================================================== --- trunk/src/main/webapp/BadFileRedirect.jsp 2011-06-21 12:56:58 UTC (rev 130) +++ trunk/src/main/webapp/BadFileRedirect.jsp 2011-06-22 12:46:07 UTC (rev 131) @@ -11,13 +11,13 @@ <link rel="icon" href="img/ScmWebEditor_little.png" type="image/png"> <link rel="stylesheet" type="text/css" href="css/main.css"> <meta http-equiv="Refresh" content="3; url= -<%=request.getParameter("scmEditorUrl")%>"> +<%=request.getParameter("projectUrl")%>"> </head> <body> <a target="_blank" href="http://maven-site.nuiton.org/scmwebeditor/"><img src="img/ScmWebEditor_main.png" alt="$alt" /></a> <p>Bad SCM path or file name! Please correct it.</p> <p>You should be transferred automatically to the form page. If not -please <a href="<%=request.getParameter("scmEditorUrl")%>">click +please <a href="<%=request.getParameter("projectUrl")%>">click this link</a>.</p> <p>©2004-2009 CodeLutin</p> </body> Modified: trunk/src/main/webapp/OutConnection.jsp =================================================================== --- trunk/src/main/webapp/OutConnection.jsp 2011-06-21 12:56:58 UTC (rev 130) +++ trunk/src/main/webapp/OutConnection.jsp 2011-06-22 12:46:07 UTC (rev 131) @@ -1,5 +1,9 @@ <%-- Document : OutConnection Created on : 6 oct. 2009, 12:07:27 Author: glorieux --%> <%@page contentType="text/html" pageEncoding="UTF-8"%> + <%@ taglib prefix="s" uri="/struts-tags"%> + <%@ taglib prefix="sj" uri="/struts-jquery-tags"%> + <sj:head jquerytheme="default"/> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> @@ -21,12 +25,28 @@ </h4> </center> <center> -<form method="get" action="checkout.action"> - <p><label>SCM path: <input TYPE=text name="address" SIZE=100></label><input type="button" value="Search Files" name="search" onclick="javascript:fileSearch(this.form.address);"/></p> +<form id="configForm" method="get" action="checkout.action"> + <p><label>SCM path: <input TYPE=text name="address" SIZE=100></label> + + <s:url id="ajaxSearch" value="search.action" /> + + <sj:submit + id="ajaxSearchButton" + formIds="configForm" + targets="htmlcontentSearch" + href="%{ajaxSearch}" + indicator="indicator" + button="true" + buttonIcon="ui-icon-refresh" + value="Search" + > + </sj:submit> + + </p> +<div id="htmlcontentSearch" ></div> -<input type="hidden" name="projectUrl" value="<%=request.getRequestURL()%>" /> -<input type="hidden" name="searchServletUrl" value="<%=request.getAttribute("searchServletUrl")%>"/> +<input type="hidden" name="projectUrl" value="<%=request.getHeader("referer")%>" /> <input type="submit" name="Save" /></form> </center> <p align="right">©2004-2009 CodeLutin</p> Modified: trunk/src/main/webapp/Save.jsp =================================================================== --- trunk/src/main/webapp/Save.jsp 2011-06-21 12:56:58 UTC (rev 130) +++ trunk/src/main/webapp/Save.jsp 2011-06-22 12:46:07 UTC (rev 131) @@ -10,7 +10,7 @@ <%if(result.equals("authError")) { %> - <h4> Bad login or password, can't save modification </h4> + <h4> <font color="red"> Bad username or password, can't save modification</font> </h4> <% } else if(result.equals("erreur")) { %> <h4> Can't save modification </h4> <% } else if(result.equals("uselessSave")) { %> Added: trunk/src/main/webapp/Search.jsp =================================================================== --- trunk/src/main/webapp/Search.jsp (rev 0) +++ trunk/src/main/webapp/Search.jsp 2011-06-22 12:46:07 UTC (rev 131) @@ -0,0 +1,27 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> +<%@page import="org.nuiton.scmwebeditor.actions.SearchAction"%> +<%@page import="java.util.LinkedList" %> +<%@page import="java.util.Iterator" %> + <%@ taglib prefix="s" uri="/struts-tags"%> + <%@ taglib prefix="sj" uri="/struts-jquery-tags"%> + <sj:head jquerytheme="default"/> + +<table> + <% + SearchAction action = SearchAction.getAction(); + + LinkedList<String> files = action.getFiles(); + + Iterator<String> it = files.iterator(); + + while(it.hasNext()) { + String file = it.next(); + %> + <tr><td> + <a href="checkout.action?address=<%=file%>&projectUrl="<%=request.getRequestURL()%>" ><%=file%></a> + + </td></tr> + <% } %> + +</table> \ No newline at end of file

1 0

r130 - in trunk/src/main: java/org/nuiton/scmwebeditor/actions resources webapp
by kcardineaud＠users.nuiton.org 21 Jun '11

21 Jun '11

Author: kcardineaud Date: 2011-06-21 14:56:58 +0200 (Tue, 21 Jun 2011) New Revision: 130 Url: http://nuiton.org/repositories/revision/scmwebeditor/130 Log: Add JQuery for ajax save and continue option Added: trunk/src/main/java/org/nuiton/scmwebeditor/actions/SaveAction.java trunk/src/main/webapp/Save.jsp Removed: trunk/src/main/webapp/Preview.js trunk/src/main/webapp/Saver.js Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java trunk/src/main/resources/struts.xml trunk/src/main/webapp/ModificationViewer.jsp trunk/src/main/webapp/Preview.jsp Added: trunk/src/main/java/org/nuiton/scmwebeditor/actions/SaveAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/SaveAction.java (rev 0) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/SaveAction.java 2011-06-21 12:56:58 UTC (rev 130) @@ -0,0 +1,44 @@ +package org.nuiton.scmwebeditor.actions; + +import com.opensymphony.xwork2.Action; +import com.opensymphony.xwork2.ActionContext; + +public class SaveAction extends ScmWebEditorCommitAction { + + String result; + + public String getResult() { + return result; + } + + + public void setResult(String result) { + this.result = result; + } + + + /** + * + */ + private static final long serialVersionUID = -115627369699637253L; + + + public String save() { + + if(origText.equals(newText)) { + result = "uselessSave"; + return Action.SUCCESS; + } + + result = execute(); + + return Action.SUCCESS; + } + + static public SaveAction getAction() { + return (SaveAction) ActionContext.getContext() + .get(CONTEXT_ACTION_KEY); + } + + +} Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java 2011-06-21 09:02:44 UTC (rev 129) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java 2011-06-21 12:56:58 UTC (rev 130) @@ -138,7 +138,7 @@ log.error("SVN FAIL",e); } //Suppression du repertoire temporaire - delTempDirectory(svnSess); + //delTempDirectory(svnSess); request.setAttribute(ATTRIBUTE_REDIRECT_URL, getRedirectUrl(svnSess)); return "erreur"; } @@ -146,7 +146,7 @@ if (svnSess.getCheckoutdir() != null) { //Suppression du repertoire temporaire - delTempDirectory(svnSess); + //delTempDirectory(svnSess); } //if commit success user is redirect on the project page request.setAttribute(ATTRIBUTE_REDIRECTION_URL, svnSess.getProjectUrl()); @@ -155,7 +155,7 @@ log.debug("End of commit"); } //Suppression du repertoire temporaire - delTempDirectory(svnSess); + //delTempDirectory(svnSess); return "success"; } Modified: trunk/src/main/resources/struts.xml =================================================================== --- trunk/src/main/resources/struts.xml 2011-06-21 09:02:44 UTC (rev 129) +++ trunk/src/main/resources/struts.xml 2011-06-21 12:56:58 UTC (rev 130) @@ -16,6 +16,9 @@ <result name="authError" >/ModificationViewer.jsp</result> <result name="erreur">/BadFileRedirect.jsp</result> </action> + <action name="save" class="org.nuiton.scmwebeditor.actions.SaveAction" method="save"> + <result>/Save.jsp</result> + </action> <action name="preview" class="org.nuiton.scmwebeditor.actions.PreviewAction" method="execute"> <result>/Preview.jsp</result> </action> Modified: trunk/src/main/webapp/ModificationViewer.jsp =================================================================== --- trunk/src/main/webapp/ModificationViewer.jsp 2011-06-21 09:02:44 UTC (rev 129) +++ trunk/src/main/webapp/ModificationViewer.jsp 2011-06-21 12:56:58 UTC (rev 130) @@ -22,13 +22,14 @@ <form method="post" action=commit.action id="editForm"> <script src="GereFormSize.js" type="text/javascript"></script> <textarea name="newText" id="newText"><%=request.getAttribute("OrigText")%></textarea> - <script src="Preview.js" type="text/javascript"></script> - <script src="Saver.js" type="text/javascript"></script> <script src="GereSession.js" type="text/javascript"></script> <script src="cancelRedirectDelete.js" type="text/javascript"></script> <script src="pictureUpload.js" type="text/javascript"></script> <noscript><h4>Javascript is not activated. You can't only use Save and Quit or Reset button.</h4></noscript> <noscript><h4>For a better use of SCMWebEditor please activate JavaScript.</h4></noscript> + + <div id="htmlcontentCommit"></div> + <p>Commit Message: <input type="text" name="commitMessage" title="Let a commit message with this file."/></p> <%if (request.getAttribute("IsLogin").equals(false) == true){ @@ -52,15 +53,29 @@ <input type="hidden" name="origText" value="<%=request.getAttribute("OrigText")%>"/> <input type="hidden" name="scmEditorUrl" value="<%=request.getAttribute("scmEditorUrl")%>"/> <input type="hidden" name="previewServletUrl" value="<%=request.getAttribute("previewServletUrl")%>"/> - <input title="Save your work and continue editing this file." type="button" value="Save and Continue Editing" name="SaveandC" onclick="javascript:saver(this.form.newText, this.form.username, this.form.pw, this.form.commitMessage, this.form.origText, this.form.scmEditorUrl);"/> + + <s:url id="ajaxCommit" value="save.action" /> + + <sj:submit + id="ajaxSaveButton" + formIds="editForm" + targets="htmlcontentCommit" + href="%{ajaxCommit}" + indicator="indicator" + button="true" + buttonIcon="ui-icon-refresh" + value="Save and Continue Editing" + > + </sj:submit> + <input title="Save this file and go back to previous page." type="submit" value="Save and Quit" name="Save"/> + <%if (request.getAttribute("format")!=null && request.getAttribute("format")!=null && request.getAttribute("format").equals("rst") == true){ %> - - <s:url id="ajaxPreview" value="preview.action" /> + <s:url id="ajaxPreview" value="preview.action" /> <sj:submit - id="ajaxformlink" + id="ajaxPreviewButton" formIds="editForm" targets="htmlcontentPreview" href="%{ajaxPreview}" @@ -70,9 +85,9 @@ value="Preview" > </sj:submit> + + <%}%> - - <%}%> <input title="Reset text as current repository HEAD revision." type="reset" value="Reset" name="Reset" alt="Test plop plop plop"/> <input type="hidden" value="<%=request.getAttribute("ProjectUrl")%>" name="ProjectUrl"> <input title="Exit ScmWebEditor without saving." type="button" value="Exit" name="Cancel" onclick="javascript:cancelRedirectDelete(this.form.origText, this.form.username, this.form.pw, this.form.commitMessage, this.form.ProjectUrl, this.form.scmEditorUrl);"/> Deleted: trunk/src/main/webapp/Preview.js =================================================================== --- trunk/src/main/webapp/Preview.js 2011-06-21 09:02:44 UTC (rev 129) +++ trunk/src/main/webapp/Preview.js 2011-06-21 12:56:58 UTC (rev 130) @@ -1,56 +0,0 @@ -/** - * @author geoffroy lorieux - */ - -function createRequestObject() -{ - var req; - if(window.XMLHttpRequest) - { - //For Firefox, Safari, Opera - req = new XMLHttpRequest(); - } - else if(window.ActiveXObject) - { - //For IE 5+ - req = new ActiveXObject("Microsoft.XMLHTTP"); - } - else - { - //Error for an old browser - alert('Your browser is not IE 5 or higher, or Firefox or Safari or Opera'); - } - return req; -} - -//Make the XMLHttpRequest Object -var http= createRequestObject(); - -function sendRequest(method, url, text) -{ - - http.open(method, url, true); - http.onreadystatechange = handleResponse; - http.setRequestHeader("Content-type", "application/x-www-form-urlencoded"); - http.send("text="+text.value); -} - -function handleResponse() -{ - if(http.readyState == 4 && http.status != 406) - { - var response = http.responseText; - document.getElementById("prevtitle").innerHTML = "Preview : "; - document.getElementById("prev").innerHTML ="<div id=\"preview\" >"+response+"</div>"; - } - else if (http.readyState == 4 && http.status == 406) - { - alert("Bad RestructuredText file format please correct it."); - } -} - -function preview(my_text, url) -{ - sendRequest("POST", "preview.action", my_text); -} - Modified: trunk/src/main/webapp/Preview.jsp =================================================================== --- trunk/src/main/webapp/Preview.jsp 2011-06-21 09:02:44 UTC (rev 129) +++ trunk/src/main/webapp/Preview.jsp 2011-06-21 12:56:58 UTC (rev 130) @@ -2,7 +2,7 @@ import="org.nuiton.scmwebeditor.actions.PreviewAction"%> <%--Title and div for rst preview--%> - <h3 id="prevtitle" ></h3> + <h3 id="prevtitle" >Preview :</h3> <div id="prev" title="Preview"> <div id="preview" > <% Added: trunk/src/main/webapp/Save.jsp =================================================================== --- trunk/src/main/webapp/Save.jsp (rev 0) +++ trunk/src/main/webapp/Save.jsp 2011-06-21 12:56:58 UTC (rev 130) @@ -0,0 +1,22 @@ +<%@page + import="org.nuiton.scmwebeditor.actions.SaveAction"%> +<%@page import="java.util.Date" %> + <% + SaveAction action = SaveAction.getAction(); + + String result = action.getResult(); + %> + + + + <%if(result.equals("authError")) { %> + <h4> Bad login or password, can't save modification </h4> + <% } else if(result.equals("erreur")) { %> + <h4> Can't save modification </h4> + <% } else if(result.equals("uselessSave")) { %> + <h4> It's useless to save the file, it is not modify</h4> + <% } else { %> + <h4>Last change save <%=new Date()%> </h4> + <% } %> + + \ No newline at end of file Deleted: trunk/src/main/webapp/Saver.js =================================================================== --- trunk/src/main/webapp/Saver.js 2011-06-21 09:02:44 UTC (rev 129) +++ trunk/src/main/webapp/Saver.js 2011-06-21 12:56:58 UTC (rev 130) @@ -1,59 +0,0 @@ -/** - * @author geoffroy lorieux - */ - -function createRequestObject() -{ - var req; - if(window.XMLHttpRequest) - { - //For Firefox, Safari, Opera - req = new XMLHttpRequest(); - } - else if(window.ActiveXObject) - { - //For IE 5+ - req = new ActiveXObject("Microsoft.XMLHTTP"); - } - else - { - //Error for an old browser - alert('Your browser is not IE 5 or higher, or Firefox or Safari or Opera'); - } - return req; -} - -//Make the XMLHttpRequest Object -var http= createRequestObject(); - -function sendReq(method, url, text, login, pass, message, orig_text) -{ - http.open(method, url, true); - http.onreadystatechange = handleResp; - http.setRequestHeader("Content-type", "application/x-www-form-urlencoded"); - http.send("newText="+text.value+"&username="+login.value+"&pw="+pass.value+"&commitMessage="+message.value+"&origText="+orig_text.value); -} - -function handleResp() -{ - if(http.readyState == 4 && http.status != 401){ - alert("Save Ok. Page will be reload shortly please wait."); - window.location.reload(true); - } else if (http.readyState == 4 && http.status == 401){ - alert("Bad login or password please recheck."); - } -} - -function saver(my_text, login, pass, message, orig_text, scmEditorUrl) -{ - - if (my_text.value != orig_text.value){ - if (confirm("Do you really want to save?")){ - - sendReq("POST", "commit.action", my_text, login, pass, message, orig_text); - - } - } else{ - alert("File don't need to be save."); - } -} \ No newline at end of file

1 0

← Newer
1
...
32
33
34
35
36
37
38
...
44
Older →

Jump to page: