Permalink
Browse files

second commit (most of the interface ect, poorly tested)

  • Loading branch information...
jejacks0n committed May 11, 2011
1 parent e9071aa commit 07a6cfd2524de79849ef8ddbffac319865c5e55d
Showing with 3,350 additions and 89 deletions.
  1. +1 −1 .rvmrc
  2. BIN .sass-cache/63e3533fe05f0615a0ad89f416a339a42772a0c1/testing.scssc
  3. BIN .sass-cache/ab32eda67f412063abde8784e7aaf5ea468acdbf/test.scssc
  4. BIN .sass-cache/c1b3d74eb7daa2a4600555fa1b01931a985a16df/carmenta_editor.scssc
  5. BIN .sass-cache/c1b3d74eb7daa2a4600555fa1b01931a985a16df/dialog.scssc
  6. BIN .sass-cache/c1b3d74eb7daa2a4600555fa1b01931a985a16df/modal.scssc
  7. BIN .sass-cache/c1b3d74eb7daa2a4600555fa1b01931a985a16df/panel.scssc
  8. BIN .sass-cache/c1b3d74eb7daa2a4600555fa1b01931a985a16df/statusbar.scssc
  9. BIN .sass-cache/c1b3d74eb7daa2a4600555fa1b01931a985a16df/toolbar.scssc
  10. +13 −3 Gemfile
  11. +126 −44 Gemfile.lock
  12. +1 −1 Rakefile
  13. BIN app/assets/images/carmenta/clippy.png
  14. BIN app/assets/images/carmenta/loading-dark.gif
  15. BIN app/assets/images/carmenta/loading-light.gif
  16. BIN app/assets/images/carmenta/toolbar/editable/buttons.png
  17. BIN app/assets/images/carmenta/toolbar/primary/_expander.png
  18. BIN app/assets/images/carmenta/toolbar/primary/_pressed.png
  19. BIN app/assets/images/carmenta/toolbar/primary/historypanel.png
  20. BIN app/assets/images/carmenta/toolbar/primary/insertcharacter.png
  21. BIN app/assets/images/carmenta/toolbar/primary/insertlink.png
  22. BIN app/assets/images/carmenta/toolbar/primary/insertmedia.png
  23. BIN app/assets/images/carmenta/toolbar/primary/inserttable.png
  24. BIN app/assets/images/carmenta/toolbar/primary/inspectorpanel.png
  25. BIN app/assets/images/carmenta/toolbar/primary/notespanel.png
  26. BIN app/assets/images/carmenta/toolbar/primary/objectspanel.png
  27. BIN app/assets/images/carmenta/toolbar/primary/preview.png
  28. BIN app/assets/images/carmenta/toolbar/primary/redo.png
  29. BIN app/assets/images/carmenta/toolbar/primary/save.png
  30. BIN app/assets/images/carmenta/toolbar/primary/todospanel.png
  31. BIN app/assets/images/carmenta/toolbar/primary/undo.png
  32. BIN app/assets/images/rails.png
  33. +9 −6 app/assets/javascripts/application.js
  34. +138 −0 app/assets/javascripts/carmenta/carmenta_editor.js.coffee
  35. +182 −0 app/assets/javascripts/carmenta/config.js.coffee
  36. +97 −0 app/assets/javascripts/carmenta/dialog.js.coffee
  37. 0 ...or/assets/stylesheets/.gitkeep → app/assets/javascripts/carmenta/dialogs/common_dialogs.js.coffee
  38. +5 −0 app/assets/javascripts/carmenta/history_buffer.js.coffee
  39. +145 −0 app/assets/javascripts/carmenta/modal.js.coffee
  40. 0 app/assets/javascripts/carmenta/modals/common_modals.js.coffee
  41. +29 −0 app/assets/javascripts/carmenta/palette.js.coffee
  42. +98 −0 app/assets/javascripts/carmenta/panel.js.coffee
  43. +31 −0 app/assets/javascripts/carmenta/regions/editable.js.coffee
  44. +7 −0 app/assets/javascripts/carmenta/regions/snippet.js.coffee
  45. +40 −0 app/assets/javascripts/carmenta/select.js.coffee
  46. +17 −0 app/assets/javascripts/carmenta/statusbar.js.coffee
  47. +126 −0 app/assets/javascripts/carmenta/toolbar.button.js.coffee
  48. +18 −0 app/assets/javascripts/carmenta/toolbar.button_group.js.coffee
  49. +58 −0 app/assets/javascripts/carmenta/toolbar.expander.js.coffee
  50. +67 −0 app/assets/javascripts/carmenta/toolbar.js.coffee
  51. +34 −0 app/assets/javascripts/carmenta/websocket.js.coffee
  52. +10 −0 app/assets/javascripts/vendor.js
  53. +5 −3 app/assets/stylesheets/application.css
  54. +15 −0 app/assets/stylesheets/carmenta/carmenta_editor.scss
  55. +136 −0 app/assets/stylesheets/carmenta/dialog.scss
  56. +88 −0 app/assets/stylesheets/carmenta/modal.scss
  57. +17 −0 app/assets/stylesheets/carmenta/statusbar.scss
  58. +267 −0 app/assets/stylesheets/carmenta/toolbar.scss
  59. +0 −3 app/controllers/application_controller.rb
  60. +27 −0 app/controllers/carmenta_controller.rb
  61. +2 −0 app/views/carmenta/_modal_link.html.haml
  62. +10 −0 app/views/carmenta/_modal_media.html.haml
  63. +98 −0 app/views/carmenta/_palette_backcolor.html.haml
  64. +98 −0 app/views/carmenta/_palette_forecolor.html.haml
  65. +15 −0 app/views/carmenta/_panel_notes.html.haml
  66. +1 −0 app/views/carmenta/_panel_todos.html.haml
  67. +10 −0 app/views/carmenta/_select_formatblock.html.haml
  68. +4 −0 app/views/carmenta/_select_style.html.haml
  69. +10 −0 app/views/carmenta/show.html.haml
  70. +0 −14 app/views/layouts/application.html.erb
  71. +11 −0 app/views/layouts/toolbar.html.haml
  72. +1 −1 config.ru
  73. +1 −1 config/application.rb
  74. +8 −0 config/cucumber.yml
  75. +14 −3 config/database.yml
  76. +1 −1 config/environment.rb
  77. +1 −1 config/environments/development.rb
  78. +1 −1 config/environments/production.rb
  79. +1 −1 config/environments/test.rb
  80. +77 −0 config/evergreen.rb
  81. +1 −1 config/initializers/secret_token.rb
  82. +2 −2 config/initializers/session_store.rb
  83. +12 −2 config/routes.rb
  84. +15 −0 db/schema.rb
  85. +9 −0 features/editing/basic.feature
  86. +14 −0 features/step_definitions/debug_steps.rb
  87. +211 −0 features/step_definitions/web_steps.rb
  88. +46 −0 features/support/env.rb
  89. +33 −0 features/support/paths.rb
  90. +39 −0 features/support/selectors.rb
  91. +39 −0 lib/server.rb
  92. +57 −0 lib/tasks/cucumber.rake
  93. +10 −0 script/cucumber
  94. +15 −0 spec/javascripts/carmenta/camenta_editor_spec.js.coffee
  95. +7 −0 spec/javascripts/carmenta/toolbar_button_group_spec.js.coffee
  96. +8 −0 spec/javascripts/carmenta/toolbar_button_spec.js.coffee
  97. +31 −0 spec/javascripts/carmenta/toolbar_spec.js.coffee
  98. +1 −0 spec/javascripts/spec_helper.js
  99. 0 vendor/assets/javascripts/{jquery.js → jquery-1.6.js}
  100. +100 −0 vendor/assets/javascripts/jquery-ui-1.8.12.custom.min.js
  101. +96 −0 vendor/assets/javascripts/jquery.cookie.js
  102. +173 −0 vendor/assets/javascripts/jquery.easing.js
  103. +178 −0 vendor/assets/javascripts/jquery.json2.js
  104. 0 vendor/assets/javascripts/{jquery_ujs.js → jquery.ujs.js}
  105. +25 −0 vendor/assets/javascripts/jquery.uri.js
  106. +57 −0 vendor/assets/javascripts/jquery.websocket.js
View
2 .rvmrc
@@ -1,4 +1,4 @@
-rvm 1.9.2@mercury
+rvm 1.9.2@carmenta
export RUBY_HEAP_MIN_SLOTS=1000000
export RUBY_HEAP_SLOTS_INCREMENT=1000000
export RUBY_HEAP_SLOTS_GROWTH_FACTOR=1
View
16 Gemfile
@@ -1,21 +1,31 @@
source 'http://rubygems.org'
-gem 'rails', :git => 'git://github.com/rails/rails.git'
+gem 'rails', '3.1.0.beta1'
gem 'mysql2'
gem 'sass'
gem 'coffee-script'
gem 'uglifier'
+gem 'haml'
+gem 'haml-rails'
+
+gem "redis"
+gem 'eventmachine', :git => 'git://github.com/eventmachine/eventmachine.git'
+gem "em-hiredis"
+gem "em-websocket"
group :development do
end
group :development, :test do
gem 'thin'
gem 'ruby-debug19', :require => 'ruby-debug'
+ gem 'evergreen', :git => 'git://github.com/jnicklas/evergreen.git', :submodules => true, :require => 'evergreen/rails'
end
group :test do
- # Pretty printed test output
- gem 'turn', :require => false
+ gem 'cucumber-rails'
+ gem 'capybara-firebug'
+ gem 'capybara'
+ gem 'database_cleaner'
end
View
@@ -1,73 +1,119 @@
GIT
- remote: git://github.com/rails/rails.git
- revision: bff374050d5a7e237fda98a1d4cc6256484e94f2
+ remote: git://github.com/eventmachine/eventmachine.git
+ revision: 5398facee0279ae435cef6a69f9a1236ade4dc20
specs:
- actionmailer (3.1.0.beta)
- actionpack (= 3.1.0.beta)
+ eventmachine (1.0.0.beta.3)
+
+GIT
+ remote: git://github.com/jnicklas/evergreen.git
+ revision: ac64d51b92a6d19092ea880cad1b30427e92ab8f
+ submodules: true
+ specs:
+ evergreen (0.4.0)
+ capybara (~> 0.4.0)
+ coffee-script (~> 2.1)
+ json_pure (>= 1.0.0)
+ launchy (>= 0.3.5)
+ sinatra (>= 1.1)
+
+GEM
+ remote: http://rubygems.org/
+ specs:
+ actionmailer (3.1.0.beta1)
+ actionpack (= 3.1.0.beta1)
mail (~> 2.3.0)
- actionpack (3.1.0.beta)
- activemodel (= 3.1.0.beta)
- activesupport (= 3.1.0.beta)
+ actionpack (3.1.0.beta1)
+ activemodel (= 3.1.0.beta1)
+ activesupport (= 3.1.0.beta1)
builder (~> 3.0.0)
erubis (~> 2.7.0)
i18n (~> 0.6.0beta1)
rack (~> 1.3.0.beta)
- rack-cache (~> 1.0.0)
+ rack-cache (~> 1.0.1)
rack-mount (~> 0.7.2)
rack-test (~> 0.6.0)
sprockets (~> 2.0.0.beta.2)
- tzinfo (~> 0.3.23)
- activemodel (3.1.0.beta)
- activesupport (= 3.1.0.beta)
+ tzinfo (~> 0.3.27)
+ activemodel (3.1.0.beta1)
+ activesupport (= 3.1.0.beta1)
bcrypt-ruby (~> 2.1.4)
builder (~> 3.0.0)
i18n (~> 0.6.0beta1)
- activerecord (3.1.0.beta)
- activemodel (= 3.1.0.beta)
- activesupport (= 3.1.0.beta)
+ activerecord (3.1.0.beta1)
+ activemodel (= 3.1.0.beta1)
+ activesupport (= 3.1.0.beta1)
arel (~> 2.1.0)
- tzinfo (~> 0.3.23)
- activeresource (3.1.0.beta)
- activemodel (= 3.1.0.beta)
- activesupport (= 3.1.0.beta)
- activesupport (3.1.0.beta)
- multi_json (~> 1.0.0)
- rails (3.1.0.beta)
- actionmailer (= 3.1.0.beta)
- actionpack (= 3.1.0.beta)
- activerecord (= 3.1.0.beta)
- activeresource (= 3.1.0.beta)
- activesupport (= 3.1.0.beta)
- bundler (~> 1.0)
- railties (= 3.1.0.beta)
- railties (3.1.0.beta)
- actionpack (= 3.1.0.beta)
- activesupport (= 3.1.0.beta)
- rack-ssl (~> 1.3.2)
- rake (>= 0.8.7)
- thor (~> 0.14.4)
-
-GEM
- remote: http://rubygems.org/
- specs:
- ansi (1.2.4)
+ tzinfo (~> 0.3.27)
+ activeresource (3.1.0.beta1)
+ activemodel (= 3.1.0.beta1)
+ activesupport (= 3.1.0.beta1)
+ activesupport (3.1.0.beta1)
+ multi_json (~> 1.0)
+ addressable (2.2.5)
archive-tar-minitar (0.5.2)
arel (2.1.0)
bcrypt-ruby (2.1.4)
builder (3.0.0)
+ capybara (0.4.1.2)
+ celerity (>= 0.7.9)
+ culerity (>= 0.2.4)
+ mime-types (>= 1.16)
+ nokogiri (>= 1.3.3)
+ rack (>= 1.0.0)
+ rack-test (>= 0.5.4)
+ selenium-webdriver (>= 0.0.27)
+ xpath (~> 0.1.3)
+ capybara-firebug (0.0.5)
+ capybara (~> 0.4.1.2)
+ celerity (0.8.9)
+ childprocess (0.1.8)
+ ffi (~> 1.0.6)
coffee-script (2.2.0)
coffee-script-source
execjs
coffee-script-source (1.1.0)
columnize (0.3.2)
+ configuration (1.2.0)
+ cucumber (0.10.2)
+ builder (>= 2.1.2)
+ diff-lcs (>= 1.1.2)
+ gherkin (>= 2.3.5)
+ json (>= 1.4.6)
+ term-ansicolor (>= 1.0.5)
+ cucumber-rails (0.4.1)
+ cucumber (>= 0.10.1)
+ nokogiri (>= 1.4.4)
+ rack-test (>= 0.5.7)
+ culerity (0.2.15)
daemons (1.1.3)
+ database_cleaner (0.6.7)
+ diff-lcs (1.1.2)
+ em-hiredis (0.1.0)
+ hiredis (~> 0.3.0)
+ em-websocket (0.2.1)
+ addressable (>= 2.1.1)
+ eventmachine (>= 0.12.9)
erubis (2.7.0)
- eventmachine (0.12.10)
execjs (0.3.1)
multi_json (~> 1.0)
+ ffi (1.0.7)
+ rake (>= 0.8.7)
+ gherkin (2.3.7)
+ json (>= 1.4.6)
+ haml (3.1.1)
+ haml-rails (0.3.4)
+ actionpack (~> 3.0)
+ activesupport (~> 3.0)
+ haml (~> 3.0)
+ railties (~> 3.0)
hike (1.0.0)
+ hiredis (0.3.1)
i18n (0.6.0beta1)
json (1.5.1)
+ json_pure (1.5.1)
+ launchy (0.4.0)
+ configuration (>= 0.0.5)
+ rake (>= 0.8.1)
linecache19 (0.5.12)
ruby_core_source (>= 0.1.4)
mail (2.3.0)
@@ -77,6 +123,7 @@ GEM
mime-types (1.16)
multi_json (1.0.0)
mysql2 (0.3.2)
+ nokogiri (1.4.4)
polyglot (0.3.1)
rack (1.3.0.beta)
rack-cache (1.0.1)
@@ -87,7 +134,22 @@ GEM
rack
rack-test (0.6.0)
rack (>= 1.0)
+ rails (3.1.0.beta1)
+ actionmailer (= 3.1.0.beta1)
+ actionpack (= 3.1.0.beta1)
+ activerecord (= 3.1.0.beta1)
+ activeresource (= 3.1.0.beta1)
+ activesupport (= 3.1.0.beta1)
+ bundler (~> 1.0)
+ railties (= 3.1.0.beta1)
+ railties (3.1.0.beta1)
+ actionpack (= 3.1.0.beta1)
+ activesupport (= 3.1.0.beta1)
+ rack-ssl (~> 1.3.2)
+ rake (>= 0.8.7)
+ thor (~> 0.14.6)
rake (0.8.7)
+ redis (2.2.0)
ruby-debug-base19 (0.11.25)
columnize (>= 0.3.1)
linecache19 (>= 0.5.11)
@@ -98,11 +160,21 @@ GEM
ruby-debug-base19 (>= 0.11.19)
ruby_core_source (0.1.5)
archive-tar-minitar (>= 0.5.2)
+ rubyzip (0.9.4)
sass (3.1.1)
+ selenium-webdriver (0.2.0)
+ childprocess (>= 0.1.7)
+ ffi (>= 1.0.7)
+ json_pure
+ rubyzip
+ sinatra (1.2.6)
+ rack (~> 1.1)
+ tilt (< 2.0, >= 1.2.2)
sprockets (2.0.0.beta.2)
hike (~> 1.0)
rack (~> 1.0)
tilt (~> 1.0)
+ term-ansicolor (1.0.5)
thin (1.2.11)
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
@@ -111,22 +183,32 @@ GEM
tilt (1.3)
treetop (1.4.9)
polyglot (>= 0.3.1)
- turn (0.8.2)
- ansi (>= 1.2.2)
tzinfo (0.3.27)
uglifier (0.5.1)
execjs
json
+ xpath (0.1.4)
+ nokogiri (~> 1.3)
PLATFORMS
ruby
DEPENDENCIES
+ capybara
+ capybara-firebug
coffee-script
+ cucumber-rails
+ database_cleaner
+ em-hiredis
+ em-websocket
+ eventmachine!
+ evergreen!
+ haml
+ haml-rails
mysql2
- rails!
+ rails (= 3.1.0.beta1)
+ redis
ruby-debug19
sass
thin
- turn
uglifier
View
@@ -4,4 +4,4 @@
require File.expand_path('../config/application', __FILE__)
-Mercury::Application.load_tasks
+Carmenta::Application.load_tasks
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
View
Binary file not shown.
@@ -1,6 +1,9 @@
-// FIXME: Tell people that this is a manifest file, real code should go into discrete files
-// FIXME: Tell people how Sprockets and CoffeeScript works
-//
-//= require jquery
-//= require jquery_ujs
-//= require_tree .
+/*!
+ * This file includes other files. To add javascript please create new .js or
+ * .js.coffee files and require them here, do not add code to this file.
+ *
+ *= require_self
+ *= require vendor
+ *= require carmenta/carmenta_editor
+ *= require_tree .
+ *---------------------------------------------------------------------------*/
Oops, something went wrong.

0 comments on commit 07a6cfd

Please sign in to comment.