Permalink
Browse files

added close button

fixed bug: clicking in blank area raised error
  • Loading branch information...
1 parent 14a37cc commit 28c1be5814b27f0a6d70497c2fb6677bd5d00466 @johnny committed Aug 23, 2011
View
@@ -1,12 +1,13 @@
GEM
remote: http://rubygems.org/
specs:
- activesupport (3.0.10)
+ activesupport (3.1.1)
+ multi_json (~> 1.0)
addressable (2.2.6)
- childprocess (0.1.9)
+ childprocess (0.2.2)
ffi (~> 1.0.6)
- chunky_png (1.2.1)
- closure-compiler (1.1.1)
+ chunky_png (1.2.5)
+ closure-compiler (1.1.4)
coffee-script (2.2.0)
coffee-script-source
execjs
@@ -16,54 +17,64 @@ GEM
fssm (>= 0.2.7)
sass (~> 3.1)
daemons (1.1.4)
- diff-lcs (1.1.2)
+ diff-lcs (1.1.3)
em-websocket (0.3.1)
addressable (>= 2.1.1)
eventmachine (>= 0.12.9)
eventmachine (0.12.10)
- execjs (1.2.4)
+ execjs (1.2.9)
multi_json (~> 1.0)
ffi (1.0.9)
fssm (0.2.7)
- guard (0.6.2)
+ guard (0.6.3)
thor (~> 0.14.6)
- guard-livereload (0.3.0)
+ guard-livereload (0.3.1)
em-websocket (>= 0.2.0)
guard (>= 0.4.0)
multi_json (~> 1.0.3)
- haml (3.1.2)
+ haml (3.1.3)
hike (1.2.1)
- i18n (0.5.0)
- json_pure (1.5.3)
+ http_router (0.10.2)
+ rack (>= 1.0.0)
+ url_mount (~> 0.2.1)
+ i18n (0.6.0)
+ json_pure (1.6.1)
maruku (0.6.0)
syntax (>= 1.0.0)
- middleman (2.0.6)
- activesupport (~> 3.0.0)
+ middleman (2.0.11)
coffee-script (~> 2.2.0)
compass (~> 0.11.3)
guard (~> 0.6.2)
haml (~> 3.1.0)
- i18n (~> 0.5.0)
maruku (~> 0.6.0)
middleman-livereload (~> 0.2.0)
+ padrino-core (= 0.10.2)
+ padrino-helpers (= 0.10.2)
rack (~> 1.3.0)
rack-test (~> 0.6.1)
- rb-fsevent (~> 0.4.2)
sass (~> 3.1.7)
sinatra (~> 1.2.6)
- slim (~> 1.0.1)
- sprockets (= 2.0.0.beta.14)
+ slim (~> 1.0.2)
+ sprockets (~> 2.0.0)
thin (~> 1.2.11)
thor (~> 0.14.0)
tilt (~> 1.3.1)
uglifier (~> 1.0.0)
middleman-livereload (0.2.0)
guard-livereload (~> 0.3.0)
multi_json (1.0.3)
- rack (1.3.2)
+ padrino-core (0.10.2)
+ activesupport (~> 3.1.0)
+ http_router (~> 0.10.2)
+ sinatra (~> 1.2.6)
+ thor (~> 0.14.3)
+ tilt (~> 1.3.0)
+ padrino-helpers (0.10.2)
+ i18n (~> 0.6)
+ padrino-core (= 0.10.2)
+ rack (1.3.4)
rack-test (0.6.1)
rack (>= 1.0)
- rb-fsevent (0.4.3.1)
rspec (2.6.0)
rspec-core (~> 2.6.0)
rspec-expectations (~> 2.6.0)
@@ -73,33 +84,35 @@ GEM
diff-lcs (~> 1.1.2)
rspec-mocks (2.6.0)
rubyzip (0.9.4)
- sass (3.1.7)
- selenium-webdriver (0.2.2)
- childprocess (>= 0.1.9)
+ sass (3.1.10)
+ selenium-webdriver (2.8.0)
+ childprocess (>= 0.2.1)
ffi (>= 1.0.7)
json_pure
rubyzip
- sinatra (1.2.6)
+ sinatra (1.2.7)
rack (~> 1.1)
tilt (>= 1.2.2, < 2.0)
- slim (1.0.1)
- temple (~> 0.3.0)
- tilt (~> 1.2)
- sprockets (2.0.0.beta.14)
+ slim (1.0.3)
+ temple (~> 0.3.4)
+ tilt (~> 1.3.2)
+ sprockets (2.0.2)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
syntax (1.0.0)
- temple (0.3.2)
+ temple (0.3.4)
thin (1.2.11)
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
thor (0.14.6)
- tilt (1.3.2)
- uglifier (1.0.1)
+ tilt (1.3.3)
+ uglifier (1.0.3)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
+ url_mount (0.2.1)
+ rack
PLATFORMS
ruby
View
16 TODO
@@ -1,4 +1,5 @@
-* [18/29] Further improvements
+* [21/30] Further improvements
+ - [ ] flexible toolbar, which stays on top
- [-] wysiwyg
- [ ] Toolbar should work only if there is a range inside the preview
(also the state checking)
@@ -26,12 +27,8 @@
- [X] enter in the middle of a heading does not move the rest of the heading down
- [X] selecting all by hand and deleting it leaves empty tags
this is a result of the current implementation of checkIfDeletedAll
- - [ ] textile
- - [ ] replace this.tag
- - [ ] add close editor
- - [ ] flexible toolbar, which stays on top
- - [ ] support haml
- [ ] provide support for external mode select
+ - [ ] support haml
- [-] Better Dialogs (for inspiration see gollum)
- [ ] display errors as tooltips
- [X] reset errors on open
@@ -56,6 +53,13 @@
- [ ] fire native events (not supported in awesome, try in kde or windows)
- [ ] clean and parse pasted html
- [ ] handle blocktags within lists
+ - [X] click in blank area should not raise error
+ - [X] add close editor
+ - [X] basics
+ - [X] show only if configured
+ - [X] reopen should be possible
+ - [X] textile
+ - [X] replace this.tag
- [X] decouple preview and data-modes
- [X] publish project
- [X] documentation
View
@@ -1,5 +1,7 @@
#!/bin/sh
+CURRENT=`git branch | grep '\*' | awk '{print $2}'`
+
cp README.mkd ..
middleman build
git commit -am 'Update joined files'
@@ -10,4 +12,4 @@ mv ../README.mkd .
git add .
git commit -am 'Update pages. See main branch for changes'
git push origin gh-pages
-git checkout master
+git checkout $CURRENT
View
@@ -4,8 +4,8 @@
%h1 MarkupEditor
%p
- is a small editor whith a strong support for textile. Other markup languages will follow.
- It has an impressive
+ is a small editor with a strong support for textile. Other markup languages will follow.
+ It has an extensive
= link_to "test suite", "test.html"
\. Documentation can be found
= link_to 'here', 'doc/index.html'
Oops, something went wrong.

0 comments on commit 28c1be5

Please sign in to comment.