William Candillon
|
b63d2c178b
|
Merge https://github.com/ajaxorg/ace
Conflicts:
build/demo/kitchen-sink/mode-coldfusion-uncompressed.js
build/demo/kitchen-sink/mode-css-uncompressed.js
build/demo/kitchen-sink/mode-groovy-uncompressed.js
build/demo/kitchen-sink/mode-html-uncompressed.js
build/demo/kitchen-sink/mode-java-uncompressed.js
build/demo/kitchen-sink/mode-javascript-uncompressed.js
build/demo/kitchen-sink/mode-markdown-uncompressed.js
build/demo/kitchen-sink/mode-php-uncompressed.js
build/demo/kitchen-sink/mode-scala-uncompressed.js
build/demo/kitchen-sink/mode-svg-uncompressed.js
build/demo/kitchen-sink/mode-xquery-uncompressed.js
build/demo/kitchen-sink/theme-cobalt-uncompressed.js
build/demo/kitchen-sink/theme-dawn-uncompressed.js
build/demo/kitchen-sink/theme-idle_fingers-uncompressed.js
build/demo/kitchen-sink/theme-kr_theme-uncompressed.js
build/demo/kitchen-sink/theme-merbivore-uncompressed.js
build/demo/kitchen-sink/theme-merbivore_soft-uncompressed.js
build/demo/kitchen-sink/theme-mono_industrial-uncompressed.js
build/demo/kitchen-sink/theme-pastel_on_dark-uncompressed.js
build/demo/kitchen-sink/theme-twilight-uncompressed.js
build/demo/kitchen-sink/theme-vibrant_ink-uncompressed.js
build/kitchen-sink.html
build/src/mode-coldfusion-noconflict.js
build/src/mode-coldfusion-uncompressed-noconflict.js
build/src/mode-coldfusion-uncompressed.js
build/src/mode-coldfusion.js
build/src/mode-css-noconflict.js
build/src/mode-css-uncompressed-noconflict.js
build/src/mode-css-uncompressed.js
build/src/mode-css.js
build/src/mode-groovy-noconflict.js
build/src/mode-groovy-uncompressed-noconflict.js
build/src/mode-groovy-uncompressed.js
build/src/mode-groovy.js
build/src/mode-html-noconflict.js
build/src/mode-html-uncompressed-noconflict.js
build/src/mode-html-uncompressed.js
build/src/mode-html.js
build/src/mode-java-noconflict.js
build/src/mode-java-uncompressed-noconflict.js
build/src/mode-java-uncompressed.js
build/src/mode-java.js
build/src/mode-javascript-noconflict.js
build/src/mode-javascript-uncompressed-noconflict.js
build/src/mode-javascript-uncompressed.js
build/src/mode-javascript.js
build/src/mode-markdown-noconflict.js
build/src/mode-markdown-uncompressed-noconflict.js
build/src/mode-markdown-uncompressed.js
build/src/mode-markdown.js
build/src/mode-php-noconflict.js
build/src/mode-php-uncompressed-noconflict.js
build/src/mode-php-uncompressed.js
build/src/mode-php.js
build/src/mode-scala-noconflict.js
build/src/mode-scala-uncompressed-noconflict.js
build/src/mode-scala-uncompressed.js
build/src/mode-scala.js
build/src/mode-svg-noconflict.js
build/src/mode-svg-uncompressed-noconflict.js
build/src/mode-svg-uncompressed.js
build/src/mode-svg.js
build/src/mode-xquery-noconflict.js
build/src/mode-xquery.js
build/src/theme-clouds-noconflict.js
build/src/theme-clouds.js
build/src/theme-clouds_midnight-noconflict.js
build/src/theme-clouds_midnight.js
build/src/theme-cobalt-noconflict.js
build/src/theme-cobalt-uncompressed-noconflict.js
build/src/theme-cobalt-uncompressed.js
build/src/theme-cobalt.js
build/src/theme-dawn-noconflict.js
build/src/theme-dawn-uncompressed-noconflict.js
build/src/theme-dawn-uncompressed.js
build/src/theme-dawn.js
build/src/theme-idle_fingers-noconflict.js
build/src/theme-idle_fingers-uncompressed-noconflict.js
build/src/theme-idle_fingers-uncompressed.js
build/src/theme-idle_fingers.js
build/src/theme-kr_theme-noconflict.js
build/src/theme-kr_theme-uncompressed-noconflict.js
build/src/theme-kr_theme-uncompressed.js
build/src/theme-kr_theme.js
build/src/theme-merbivore-noconflict.js
build/src/theme-merbivore-uncompressed-noconflict.js
build/src/theme-merbivore-uncompressed.js
build/src/theme-merbivore.js
build/src/theme-merbivore_soft-noconflict.js
build/src/theme-merbivore_soft-uncompressed-noconflict.js
build/src/theme-merbivore_soft-uncompressed.js
build/src/theme-merbivore_soft.js
build/src/theme-mono_industrial-noconflict.js
build/src/theme-mono_industrial-uncompressed-noconflict.js
build/src/theme-mono_industrial-uncompressed.js
build/src/theme-mono_industrial.js
build/src/theme-monokai-noconflict.js
build/src/theme-monokai.js
build/src/theme-pastel_on_dark-noconflict.js
build/src/theme-pastel_on_dark-uncompressed-noconflict.js
build/src/theme-pastel_on_dark-uncompressed.js
build/src/theme-pastel_on_dark.js
build/src/theme-solarized_dark-noconflict.js
build/src/theme-solarized_dark.js
build/src/theme-solarized_light-noconflict.js
build/src/theme-solarized_light.js
build/src/theme-tomorrow-noconflict.js
build/src/theme-tomorrow.js
build/src/theme-tomorrow_night-noconflict.js
build/src/theme-tomorrow_night.js
build/src/theme-tomorrow_night_blue-noconflict.js
build/src/theme-tomorrow_night_blue.js
build/src/theme-tomorrow_night_bright-noconflict.js
build/src/theme-tomorrow_night_bright.js
build/src/theme-tomorrow_night_eighties-noconflict.js
build/src/theme-tomorrow_night_eighties.js
build/src/theme-twilight-noconflict.js
build/src/theme-twilight-uncompressed-noconflict.js
build/src/theme-twilight-uncompressed.js
build/src/theme-twilight.js
build/src/theme-vibrant_ink-noconflict.js
build/src/theme-vibrant_ink-uncompressed-noconflict.js
build/src/theme-vibrant_ink-uncompressed.js
build/src/theme-vibrant_ink.js
|
2012-04-14 11:54:32 +02:00 |
|
William Candillon
|
a8bd5fb56b
|
Minor refactoring in the XQuery worker client.
|
2012-04-13 16:20:41 +02:00 |
|
William Candillon
|
d069b8508c
|
Update header file.
|
2012-04-13 16:03:05 +02:00 |
|
William Candillon
|
d5156baa32
|
Remove logging.
|
2012-04-13 16:00:44 +02:00 |
|
William Candillon
|
0991f44263
|
Add proof of concept for semantic highlighting.
|
2012-04-13 15:55:49 +02:00 |
|
Fabian Jakobs
|
9fc464e781
|
allow module
|
2012-04-13 12:12:29 +02:00 |
|
Fabian Jakobs
|
aa5cac8fb3
|
enable multi cursor by default
|
2012-04-13 12:07:36 +02:00 |
|
Fabian Jakobs
|
caf151e232
|
Merge pull request #718 from nightwing/multiCursor
Multi cursor cleanup and docs
|
2012-04-13 02:00:19 -07:00 |
|
Garen Torikian
|
9826360ea5
|
Add CSS3 rules
|
2012-04-12 16:52:54 -07:00 |
|
nightwing
|
2b3a950613
|
make cut a command, and add documentation
|
2012-04-12 22:42:57 +04:00 |
|
nightwing
|
387790d94c
|
cleanup
|
2012-04-12 22:42:56 +04:00 |
|
Fabian Jakobs
|
d578c63beb
|
small js mode fix
|
2012-04-12 18:04:22 +02:00 |
|
Fabian Jakobs
|
498cc1a89d
|
caret is only 1px width
|
2012-04-12 16:48:55 +02:00 |
|
Fabian Jakobs
|
24eccde63e
|
more scrolling fixes
|
2012-04-12 16:40:58 +02:00 |
|
Fabian Jakobs
|
aed7ca654c
|
Merge branch 'multiCursor'
Conflicts:
demo/kitchen-sink/demo.js
lib/ace/test/all_browser.js
|
2012-04-12 16:03:24 +02:00 |
|
Fabian Jakobs
|
b34d25f82d
|
small cleanups
|
2012-04-12 15:59:45 +02:00 |
|
Fabian Jakobs
|
8c7b030128
|
cleanups
|
2012-04-12 15:33:04 +02:00 |
|
Fabian Jakobs
|
d9456740c6
|
Merge remote-tracking branch 'nightwing/multiCursor' into multiCursor
Conflicts:
lib/ace/multi_select.js
|
2012-04-12 15:32:33 +02:00 |
|
Fabian Jakobs
|
d020cf0e66
|
Merge pull request #707 from justjohn/master
LESS syntax highlighting support
|
2012-04-12 05:11:22 -07:00 |
|
Fabian Jakobs
|
9deb81fcaf
|
- add animated scrolling to the demo
- fix infinite loop
- fix some typos
|
2012-04-12 13:00:20 +02:00 |
|
nightwing
|
b44d19ed63
|
scroll selection into view only after find/replace
Conflicts:
lib/ace/editor.js
|
2012-04-12 10:09:52 +02:00 |
|
Fabian Jakobs
|
c40ffa7323
|
remove corner element
|
2012-04-12 10:08:34 +02:00 |
|
Ruben Daniels
|
7b00aa8081
|
* Fixed merge oops
|
2012-04-11 21:23:54 +02:00 |
|
Fabian Jakobs
|
72ca7d98d5
|
Merge pull request #712 from nightwing/subpixel
Subpixel positioning
|
2012-04-11 10:04:51 -07:00 |
|
nightwing
|
378f161143
|
fix failing test
|
2012-04-11 21:00:15 +04:00 |
|
Fabian Jakobs
|
32c88cfb77
|
Merge pull request #591 from okonomiyaki3000/master
Numer of items replaced
|
2012-04-11 09:13:11 -07:00 |
|
nightwing
|
c0550e0891
|
use position="fixed" to not cause problems on rtl sites
|
2012-04-11 20:08:50 +04:00 |
|
nightwing
|
9a45c466ae
|
use getBoundingClientRect for measuring text size
needed because on chrome 17+ line heights can be fractional
|
2012-04-11 20:08:50 +04:00 |
|
nightwing
|
ca35f324c8
|
small cleanup
|
2012-04-11 19:31:43 +04:00 |
|
Fabian Jakobs
|
59ddc64d3d
|
fix unit test
|
2012-04-11 17:28:06 +02:00 |
|
Ruben Daniels
|
d6c3e006b6
|
* Added active line highlighting for the gutter
|
2012-04-11 17:26:32 +02:00 |
|
Fabian Jakobs
|
770ab82cbf
|
Merge branch 'feature/shadowgutter'
Conflicts:
build/kitchen-sink.html
build/src/ace-noconflict.js
build/src/ace.js
lib/ace/virtual_renderer.js
|
2012-04-11 17:23:45 +02:00 |
|
Fabian Jakobs
|
2208ccdd48
|
coding styles
|
2012-04-11 17:19:56 +02:00 |
|
Fabian Jakobs
|
94eddc1362
|
some cleanups. Tabs to spaces, etc
|
2012-04-11 16:55:27 +02:00 |
|
Fabian Jakobs
|
d3f147cc72
|
update themes
|
2012-04-11 16:06:49 +02:00 |
|
Fabian Jakobs
|
a675d6a0f7
|
Merge pull request #699 from danyaPostfactum/master
xml entity support, doctype declaration is marked as "xml_re", not "meta.tag"
|
2012-04-11 06:59:20 -07:00 |
|
Garen Torikian
|
f1c609db1e
|
Merge pull request #693 from ajaxorg/feature/animscroll
* Added animation for scrolling for find and gotoline
|
2012-04-10 10:41:00 -07:00 |
|
Garen Torikian
|
fc4625e1b6
|
Merge master
|
2012-04-10 10:39:55 -07:00 |
|
Garen Torikian
|
27629c05ff
|
Remove unneeded todo
|
2012-04-10 10:37:27 -07:00 |
|
John Roepke
|
811abefc45
|
Merge git://github.com/ajaxorg/ace
|
2012-04-09 21:22:42 +00:00 |
|
danyaPostfactum
|
a4826b938a
|
Change entity.reference to constant.character.entity
|
2012-04-10 04:52:13 +10:00 |
|
danyaPostfactum
|
a7025742a4
|
Change entity.reference to constant.character.entity
|
2012-04-10 04:50:33 +10:00 |
|
William Candillon
|
afa970767a
|
Fix bugs in the XQuery parser and lexer.
|
2012-04-09 19:17:22 +02:00 |
|
nightwing
|
2021536794
|
emit event before executing a command
|
2012-04-08 17:19:29 +04:00 |
|
Ruben Daniels
|
fddab9eef0
|
* Merged with master
* Built ace
Merge branch 'master' of github.com:ajaxorg/ace into feature/animscroll
Conflicts:
build/kitchen-sink.html
build/src/ace-noconflict.js
build/src/ace.js
build/src/mode-c_cpp-noconflict.js
build/src/mode-c_cpp.js
build/src/mode-clojure-noconflict.js
build/src/mode-clojure.js
build/src/mode-coldfusion-noconflict.js
build/src/mode-coldfusion.js
build/src/mode-csharp-noconflict.js
build/src/mode-csharp.js
build/src/mode-css-noconflict.js
build/src/mode-css.js
build/src/mode-groovy-noconflict.js
build/src/mode-groovy.js
build/src/mode-haxe-noconflict.js
build/src/mode-haxe.js
build/src/mode-html-noconflict.js
build/src/mode-html.js
build/src/mode-java-noconflict.js
build/src/mode-java.js
build/src/mode-javascript-noconflict.js
build/src/mode-javascript.js
build/src/mode-json-noconflict.js
build/src/mode-json.js
build/src/mode-markdown-noconflict.js
build/src/mode-markdown.js
build/src/mode-php-noconflict.js
build/src/mode-php.js
build/src/mode-powershell-noconflict.js
build/src/mode-powershell.js
build/src/mode-scad-noconflict.js
build/src/mode-scad.js
build/src/mode-scala-noconflict.js
build/src/mode-scala.js
build/src/mode-svg-noconflict.js
build/src/mode-svg.js
build/src/mode-xml-noconflict.js
build/src/mode-xml.js
|
2012-04-08 13:22:50 +02:00 |
|
Ruben Daniels
|
ec061ff303
|
Merged from master
|
2012-04-08 11:56:01 +02:00 |
|
Ruben Daniels
|
f7be320575
|
* added gutter shadow as horizontal scrolling indicator
|
2012-04-08 11:49:45 +02:00 |
|
Ruben Daniels
|
7e70887b09
|
* Optimized Virtual Rendered animated scrolling
|
2012-04-07 23:28:59 +02:00 |
|
Garen Torikian
|
cbc3858ff2
|
Fix highlighting rules
|
2012-04-06 20:52:53 -07:00 |
|
nightwing
|
1254357d92
|
Merge remote-tracking branch 'remotes/upstream/master'
Conflicts:
lib/ace/commands/command_manager.js
lib/ace/test/mockrenderer.js
lib/ace/test/all_browser.js
|
2012-04-07 01:00:49 +04:00 |
|