Commit graph

2,768 commits

Author SHA1 Message Date
Harutyun Amirjanyan
b85c899755 do not include spaces in clojure symbols 2013-04-19 19:10:56 +04:00
nightwing
03f6c8fda8 tweak clojure symbol highlighting 2013-04-18 10:20:41 +04:00
nightwing
94e919ad82 fix #1372 . in clojure symbols isn't highlighted 2013-04-17 22:20:50 +04:00
nightwing
834d0aee9f update tests 2013-04-17 16:28:59 +04:00
nightwing
35563c5e84 update modelist extension 2013-04-17 16:15:58 +04:00
nightwing
635da1f2ea temporary workaround for tokenizer not working for rules ending with $ 2013-04-17 16:12:44 +04:00
nightwing
b54a00cb4d add ini mode 2013-04-17 15:52:56 +04:00
nightwing
689ebf8b48 highlight last search result when searchbox is focused 2013-04-16 22:24:40 +04:00
nightwing
cc01912250 rename snippets syntax highlighter 2013-04-16 22:23:48 +04:00
nightwing
4a5fe215c4 Merge remote-tracking branch 'remotes/origin/highlighting/tmmodes' into master
Conflicts:
	demo/kitchen-sink/modelist.js
2013-04-16 19:09:00 +04:00
nightwing
62a25b0ce6 fix setting for keybinding 2013-04-15 11:03:44 +04:00
nightwing
63551228ee update styling and clean up demos 2013-04-15 00:19:08 +04:00
nightwing
5894667b41 update code formatting, and general cleanup 2013-04-13 23:07:36 +04:00
nightwing
95f822c6d8 Merge branch modelist 2013-04-13 22:31:44 +04:00
nightwing
919c8221ab Merge branch setting_menu 2013-04-13 22:31:10 +04:00
nightwing
41e1f08dfe Merge remote-tracking branch 'remotes/origin/statusbar' 2013-04-13 22:30:24 +04:00
nightwing
734a5b32f2 Merge remote-tracking branch 'remotes/origin/static_highlighter' 2013-04-13 22:29:34 +04:00
Matthew Kastor
a37b9ac53a adds modelist to extensions
I copied the modelist.js file from the kitchen sink demo and added doc
comments to the exported methods.

This module would be extremely helpful to anyone implementing a menu
system or who wanted to programatically switch rendering modes based on
the file extension of the file loaded into ace. I can think of several
use cases for it already. (1) in the settingsMenu branch. (2) in
supporting theme switching for anyone implementing drag and drop support
for loading files into the editor (3) in supporting theme switching for
sites implementing their own file picker dialogues and loading content
into ace through xmlhttprequest (4) in supporting filebrowser / editor
applications where a server could be set up to display file contents in
an ace editor as users browsed to arbitrary files. (5) etc. etc.

Had I known about it when I began writing the settingsMenu branch I
would have used it.
2013-04-13 20:55:07 +04:00
Matthew Kastor
408b190bb0 refactored settings menu extension 2013-04-13 20:53:41 +04:00
Matthew Kastor
60616deec0 add_editor_menu_options uses themelist to generate theme options 2013-04-13 20:53:41 +04:00
Matthew Kastor
5ea87bd96d themelist consumes themes.js & mimics modelist 2013-04-13 20:53:41 +04:00
Matthew Kastor
2107796de5 autogenerated themes.js during build 2013-04-13 20:53:41 +04:00
Matthew Kastor
47329e944f Merge modelist branch & use it
This branch now depends on the modelist being pulled in as a module. I'm
using the modelist to generate the menu options for switching modes
because it's redundant to have the same massive list in two places.

The modelist module also has some awesome features so I choose it over
my silly list. :D
2013-04-13 20:53:41 +04:00
nightwing
3adba8eb21 adds demo show_settings_menu
adds keyboard shortcut on init

adds keyboard shortcut on init
2013-04-13 20:52:58 +04:00
Matthew Kastor
7aac105a07 augments Editor.prototype 2013-04-13 20:52:50 +04:00
Matthew Kastor
d531866663 augments Editor.prototype 2013-04-13 20:52:50 +04:00
Matthew Kastor
b1ac371387 fixes esc event listener removal 2013-04-13 20:52:50 +04:00
nightwing
fb9bc6d3f4 prettifies menu option labels
removes "set" adds space before uppercase letters.

focus handling

focus handling
2013-04-13 20:52:50 +04:00
Matthew Kastor
9e9cdb3c48 removes commands from default commands 2013-04-13 20:52:22 +04:00
Matthew Kastor
0631a708bc removes requires from Editor 2013-04-13 20:49:46 +04:00
Matthew Kastor
b0e496de88 moved utilities to subdirectory 2013-04-13 20:49:46 +04:00
Matthew Kastor
ccae5bd8d5 remove console.log 2013-04-13 20:49:46 +04:00
Matthew Kastor
be52f7316a fix typo 2013-04-13 20:49:46 +04:00
Matthew Kastor
8244231254 adds support for closing menus by pressing esc 2013-04-13 20:49:46 +04:00
Matthew Kastor
0a289d2468 removed left property assignment
When the editor takes up the entire window and the window is only half
the size of my screen, the menus get crunched up horribly.  I'll provide
for closing the overlay by pressing esc in case the overlay's contents
take up the entire screen.

If ace is to be used in very small frames then implementors will need to
provide styling information in css to control how the settings menu
looks.
2013-04-13 20:49:46 +04:00
Matthew Kastor
24a00578c6 removed unnecessary function
since I've moved the functions to the editor and session objects
themselves I can get rid of this.
2013-04-13 20:49:46 +04:00
Matthew Kastor
b0c08dced1 adds setWrapLimit to session 2013-04-13 20:49:45 +04:00
Matthew Kastor
340f004fd0 adds getFontSize to editor 2013-04-13 20:49:45 +04:00
Matthew Kastor
1518a460ae adds description to kb & settings menu methods 2013-04-13 20:49:45 +04:00
Matthew Kastor
f6d1c1167c adds show kb & settings menu to editor 2013-04-13 20:49:45 +04:00
Matthew Kastor
c9f0439cf3 add license block 2013-04-13 20:48:57 +04:00
Matthew Kastor
c695db475a set wrap limit wraps within 20 chars 2013-04-13 20:48:57 +04:00
Matthew Kastor
6b1e90fbc7 fixed position to avoid scrolling away
The overlay menu should remain visible when scrolling a long page.  The
intention is to present information on demand and not leave the menu on
screen. If allowed to scroll away the remaining element could interfere
with the page.
2013-04-13 20:48:57 +04:00
Matthew Kastor
cc4d524a8a prettified settings menu 2013-04-13 20:47:21 +04:00
Matthew Kastor
52a1dffa9f menus will open only 1 at a time per menu. 2013-04-13 20:47:21 +04:00
Matthew Kastor
4ec0a6e706 prettified kb menu 2013-04-13 20:46:24 +04:00
Matthew Kastor
3bca16ac73 fix top margin on kb shortcuts menu 2013-04-13 20:46:24 +04:00
Matthew Kastor
fb7152cb10 prettified generic menu 2013-04-13 20:46:24 +04:00
Matthew Kastor
baaf4dd0b4 Separated logic from presentation, lowercased file names
I pulled the code for generating the menu out into its own module called
overlay_page. I pulled the code for generating a menu, using
overlay_page, out into its own module called show_keyboard_shortcuts.
The logic for getting a list of keyboard shortcuts pertinent to the
current operating system is by itself in the module
get_editor_keyboard_shortcuts. This should make it easy for anyone to
change the appearance of the menu without worrying about breaking the
code which fetches the data.
2013-04-13 20:42:55 +04:00
Matthew Kastor
d4f4758b17 adds keyboard shortcuts menu
I'm not set on the keybinding or the aesthetics of this. please change
them at will. The main goal here is to provide some method to list all
the keyboard shortcuts dynamically. I mean that when new shortcuts are
added they should automatically be put into this menu without anyone
writing any extra code. The menu provides a way for end users to easily
discover the many built in functions accessible through the keyboard.

Admittedly the current keybinding to display this menu is not very
convenient or easily guessed. I like the way that the textarea version
of ace presents a single clickable corner that is easily identified by
users. It would be cool to make this pretty and obvious.
2013-04-13 20:42:08 +04:00