Permalink
Browse files

update middleman

generated docs
  • Loading branch information...
1 parent f2867c2 commit d32e3edf5f661aa4b5e82c66fb21d231d3f908ec @johnny committed Aug 22, 2011
Showing with 10,720 additions and 255 deletions.
  1. +53 −43 Gemfile.lock
  2. +8 −8 TODO
  3. +1 −1 build.sh
  4. +10 −0 doc.sh
  5. +4 −4 join
  6. +0 −60 public/javascripts/joined-min.js
  7. 0 {views → source}/dev.html.haml
  8. +358 −0 source/doc/css/all.css
  9. BIN source/doc/css/fonts/mplus-1m-bold-webfont.eot
  10. +134 −0 source/doc/css/fonts/mplus-1m-bold-webfont.svg
  11. BIN source/doc/css/fonts/mplus-1m-bold-webfont.ttf
  12. BIN source/doc/css/fonts/mplus-1m-bold-webfont.woff
  13. BIN source/doc/css/fonts/mplus-1m-regular-webfont.eot
  14. +134 −0 source/doc/css/fonts/mplus-1m-regular-webfont.svg
  15. BIN source/doc/css/fonts/mplus-1m-regular-webfont.ttf
  16. BIN source/doc/css/fonts/mplus-1m-regular-webfont.woff
  17. +217 −0 source/doc/css/handheld.css
  18. +297 −0 source/doc/css/screen.css
  19. +204 −0 source/doc/files.html
  20. +130 −0 source/doc/index.html
  21. +326 −0 source/doc/javascript/all.js
  22. +6 −0 source/doc/javascript/html5.js
  23. +472 −0 source/doc/symbols/Editor.html
  24. +462 −0 source/doc/symbols/ME.html
  25. +242 −0 source/doc/symbols/ME.options.html
  26. +1,038 −0 source/doc/symbols/Mode.html
  27. +364 −0 source/doc/symbols/Toolbar.html
  28. +292 −0 source/doc/symbols/ToolbarButton.html
  29. +298 −0 source/doc/symbols/ToolbarSelect.html
  30. +122 −0 source/doc/symbols/_global_.html
  31. +286 −0 source/doc/symbols/jQuery.html
  32. +147 −0 source/doc/symbols/src/source_javascripts_dialog.js.html
  33. +813 −0 source/doc/symbols/src/source_javascripts_markupEditor.js.html
  34. +84 −0 source/doc/symbols/src/source_javascripts_modes_htmlMode.js.html
  35. +688 −0 source/doc/symbols/src/source_javascripts_modes_wysiwygMode.js.html
  36. +100 −0 source/doc/symbols/src/source_javascripts_plugins_combobox.js.html
  37. +95 −0 source/doc/symbols/src/source_javascripts_plugins_enhanceTextfield.js.html
  38. +74 −0 source/doc/symbols/src/source_javascripts_plugins_isValid.js.html
  39. +21 −0 source/doc/symbols/src/source_javascripts_util.js.html
  40. +2 −0 {views → source}/index.html.haml
  41. 0 {public → source}/javascripts/dialog.js
  42. +65 −0 source/javascripts/joined-min.js
  43. +553 −115 {public → source}/javascripts/joined.js
  44. +89 −24 {public → source}/javascripts/markupEditor.js
  45. 0 {public → source}/javascripts/modes/htmlMode.js
  46. 0 {public → source}/javascripts/modes/textile/bruteForceCompiler.js
  47. 0 {public → source}/javascripts/modes/textile/textileMode.js
  48. 0 {public → source}/javascripts/modes/wysiwygMode.js
  49. 0 {public → source}/javascripts/plugins/combobox.js
  50. 0 {public → source}/javascripts/plugins/enhanceTextfield.js
  51. 0 {public → source}/javascripts/plugins/isValid.js
  52. 0 {public → source}/javascripts/site.js
  53. 0 {public → source}/javascripts/test/markupEditor.js
  54. 0 {public → source}/javascripts/test/seleniumSupport.js
  55. 0 {public → source}/javascripts/test/testHelper.js
  56. 0 {public → source}/javascripts/test/textileCompiler.js
  57. 0 {public → source}/javascripts/test/textileMode.js
  58. 0 {public → source}/javascripts/test/wysiwygMode.js
  59. 0 {public → source}/javascripts/util.js
  60. 0 {public → source}/javascripts/vendor/jquery-ui.js
  61. 0 {public → source}/javascripts/vendor/jquery.js
  62. 0 {public → source}/javascripts/vendor/qunit.js
  63. 0 {views → source}/layout.haml
  64. 0 {views → source}/multiple.html.haml
  65. 0 {views → source}/releaseLayout.haml
  66. 0 {views → source}/selenium.html.haml
  67. BIN {public → source}/stylesheets/images/icons/disk.png
  68. BIN {public → source}/stylesheets/images/icons/image.png
  69. BIN {public → source}/stylesheets/images/icons/layout.png
  70. BIN {public → source}/stylesheets/images/icons/link.png
  71. BIN {public → source}/stylesheets/images/icons/text_align_center.png
  72. BIN {public → source}/stylesheets/images/icons/text_align_left.png
  73. BIN {public → source}/stylesheets/images/icons/text_align_right.png
  74. BIN {public → source}/stylesheets/images/icons/text_bold.png
  75. BIN {public → source}/stylesheets/images/icons/text_italic.png
  76. BIN {public → source}/stylesheets/images/icons/text_list_bullets.png
  77. BIN {public → source}/stylesheets/images/icons/text_list_numbers.png
  78. 0 {views → source}/stylesheets/markupEditor.css.sass
  79. 0 {public → source}/stylesheets/qunit.css
  80. BIN {public → source}/stylesheets/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
  81. BIN {public → source}/stylesheets/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
  82. BIN {public → source}/stylesheets/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
  83. BIN {public → source}/stylesheets/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
  84. BIN {public → source}/stylesheets/smoothness/images/ui-bg_glass_75_dadada_1x400.png
  85. BIN {public → source}/stylesheets/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
  86. BIN {public → source}/stylesheets/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
  87. BIN {public → source}/stylesheets/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
  88. BIN {public → source}/stylesheets/smoothness/images/ui-icons_222222_256x240.png
  89. BIN {public → source}/stylesheets/smoothness/images/ui-icons_2e83ff_256x240.png
  90. BIN {public → source}/stylesheets/smoothness/images/ui-icons_454545_256x240.png
  91. BIN {public → source}/stylesheets/smoothness/images/ui-icons_888888_256x240.png
  92. BIN {public → source}/stylesheets/smoothness/images/ui-icons_cd0a0a_256x240.png
  93. 0 {public → source}/stylesheets/smoothness/jquery-ui-1.8.13.custom.css
  94. 0 {views → source}/test.html.haml
  95. 0 {views → source}/test_runner.html.haml
  96. 0 {views → source}/textareas/html.erb
  97. 0 {views → source}/textareas/textile.erb
  98. +18 −0 template/codeview/allclasses.tmpl
  99. +39 −0 template/codeview/allfiles.tmpl
  100. +679 −0 template/codeview/class.tmpl
  101. +358 −0 template/codeview/css/all.css
  102. BIN template/codeview/css/fonts/mplus-1m-bold-webfont.eot
  103. +134 −0 template/codeview/css/fonts/mplus-1m-bold-webfont.svg
  104. BIN template/codeview/css/fonts/mplus-1m-bold-webfont.ttf
  105. BIN template/codeview/css/fonts/mplus-1m-bold-webfont.woff
  106. BIN template/codeview/css/fonts/mplus-1m-regular-webfont.eot
  107. +134 −0 template/codeview/css/fonts/mplus-1m-regular-webfont.svg
  108. BIN template/codeview/css/fonts/mplus-1m-regular-webfont.ttf
  109. BIN template/codeview/css/fonts/mplus-1m-regular-webfont.woff
  110. +217 −0 template/codeview/css/handheld.css
  111. +297 −0 template/codeview/css/screen.css
  112. +326 −0 template/codeview/javascript/all.js
  113. +6 −0 template/codeview/javascript/html5.js
  114. +21 −0 template/codeview/license.txt
  115. +236 −0 template/codeview/publish.js
  116. +6 −0 template/codeview/subtemplates/foot.tmpl
  117. +22 −0 template/codeview/subtemplates/head.tmpl
  118. +38 −0 template/codeview/subtemplates/menu.tmpl
View
@@ -1,64 +1,69 @@
GEM
remote: http://rubygems.org/
specs:
- activesupport (3.0.9)
+ activesupport (3.0.10)
+ addressable (2.2.6)
childprocess (0.1.9)
ffi (~> 1.0.6)
- chunky_png (1.2.0)
+ chunky_png (1.2.1)
closure-compiler (1.1.1)
coffee-script (2.2.0)
coffee-script-source
execjs
- coffee-script-source (1.1.1)
- compass (0.11.2)
- chunky_png (~> 1.1)
+ coffee-script-source (1.1.2)
+ compass (0.11.5)
+ chunky_png (~> 1.2)
fssm (>= 0.2.7)
sass (~> 3.1)
- crack (0.1.8)
daemons (1.1.4)
diff-lcs (1.1.2)
+ em-websocket (0.3.1)
+ addressable (>= 2.1.1)
+ eventmachine (>= 0.12.9)
eventmachine (0.12.10)
- execjs (1.2.0)
+ execjs (1.2.4)
multi_json (~> 1.0)
ffi (1.0.9)
fssm (0.2.7)
+ guard (0.6.2)
+ thor (~> 0.14.6)
+ guard-livereload (0.3.0)
+ em-websocket (>= 0.2.0)
+ guard (>= 0.4.0)
+ multi_json (~> 1.0.3)
haml (3.1.2)
- http_router (0.7.10)
- rack (>= 1.0.0)
- url_mount (~> 0.2.1)
- httparty (0.7.8)
- crack (= 0.1.8)
- i18n (0.6.0)
+ hike (1.2.1)
+ i18n (0.5.0)
json_pure (1.5.3)
- middleman (1.2.8)
+ maruku (0.6.0)
+ syntax (>= 1.0.0)
+ middleman (2.0.6)
+ activesupport (~> 3.0.0)
coffee-script (~> 2.2.0)
- compass (= 0.11.2)
+ compass (~> 0.11.3)
+ guard (~> 0.6.2)
haml (~> 3.1.0)
- httparty (~> 0.7.0)
- padrino-core (~> 0.9.23)
- padrino-helpers (~> 0.9.23)
- rack (~> 1.0)
- rack-test (~> 0.5.0)
- sass (~> 3.1.0)
- shotgun (~> 0.8.0)
- sinatra (~> 1.2.0)
- thin (~> 1.2.0)
+ i18n (~> 0.5.0)
+ maruku (~> 0.6.0)
+ middleman-livereload (~> 0.2.0)
+ 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)
+ thin (~> 1.2.11)
thor (~> 0.14.0)
- tilt (~> 1.3.0)
- uglifier (~> 0.5.0)
+ tilt (~> 1.3.1)
+ uglifier (~> 1.0.0)
+ middleman-livereload (0.2.0)
+ guard-livereload (~> 0.3.0)
multi_json (1.0.3)
- padrino-core (0.9.29)
- activesupport (>= 3.0.0)
- http_router (~> 0.7.8)
- sinatra (~> 1.2.6)
- thor (>= 0.14.3)
- tilt (~> 1.3.0)
- padrino-helpers (0.9.29)
- i18n (>= 0.4.1)
- padrino-core (= 0.9.29)
- rack (1.3.0)
- rack-test (0.5.7)
+ rack (1.3.2)
+ 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)
@@ -68,28 +73,33 @@ GEM
diff-lcs (~> 1.1.2)
rspec-mocks (2.6.0)
rubyzip (0.9.4)
- sass (3.1.4)
+ sass (3.1.7)
selenium-webdriver (0.2.2)
childprocess (>= 0.1.9)
ffi (>= 1.0.7)
json_pure
rubyzip
- shotgun (0.8)
- rack (>= 1.0)
sinatra (1.2.6)
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)
+ hike (~> 1.2)
+ rack (~> 1.0)
+ tilt (~> 1.1, != 1.3.0)
+ syntax (1.0.0)
+ temple (0.3.2)
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 (0.5.4)
+ uglifier (1.0.1)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
- url_mount (0.2.1)
- rack
PLATFORMS
ruby
View
16 TODO
@@ -1,11 +1,4 @@
-* [17/29] Further improvements
- - [-] publish project
- - [ ] documentation
- - [X] better static files handling:
- - [X] package files
- - [X] join and compress js files
- - [X] push to github
- - [X] decouple preview and data-modes
+* [18/29] Further improvements
- [-] wysiwyg
- [ ] Toolbar should work only if there is a range inside the preview
(also the state checking)
@@ -63,6 +56,13 @@
- [ ] fire native events (not supported in awesome, try in kde or windows)
- [ ] clean and parse pasted html
- [ ] handle blocktags within lists
+ - [X] decouple preview and data-modes
+ - [X] publish project
+ - [X] documentation
+ - [X] better static files handling:
+ - [X] package files
+ - [X] join and compress js files
+ - [X] push to github
- [X] list functionality
- [X] wysiwyg
- [X] button click
View
@@ -1,7 +1,7 @@
#!/bin/sh
cp README.mkd ..
-mm-build
+middleman build
git commit -am 'Update joined files'
git checkout gh-pages
rm -R javascripts/ stylesheets/
View
10 doc.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+export JSDOCDIR=~/apps/jsdoc-toolkit
+
+rm -R source/doc/
+
+#jsrun.sh -t=$JSDOCDIR/templates/jsdoc -d=source/doc/ \
+# source/javascripts/modes/ source/javascripts/plugins/ source/javascripts/markupEditor.js source/javascripts/util.js source/javascripts/dialog.js
+jsrun.sh -p -t=template/codeview/ -d=source/doc/ \
+ source/javascripts/modes/ source/javascripts/plugins/ source/javascripts/markupEditor.js source/javascripts/util.js source/javascripts/dialog.js
View
8 join
@@ -2,7 +2,7 @@
files = %w{plugins/isValid markupEditor util plugins/enhanceTextfield plugins/combobox dialog modes/textile/textileMode modes/textile/bruteForceCompiler modes/wysiwygMode}
-File.open('public/javascripts/joined.js','w') do |file|
+File.open('source/javascripts/joined.js','w') do |file|
files.each do |filename|
regexp = /( # Match she-bang style C-comment
\/\*[!*] # Opening delimiter.
@@ -16,15 +16,15 @@ File.open('public/javascripts/joined.js','w') do |file|
$\s*\/\/.* # One line comments
)/x
- file.puts File.open('public/javascripts/' + filename + '.js').read #.gsub(regexp, '')
+ file.puts File.open('source/javascripts/' + filename + '.js').read #.gsub(regexp, '')
end
end
require 'rubygems'
require 'closure-compiler'
-File.open('public/javascripts/joined-min.js','w') do |file|
+File.open('source/javascripts/joined-min.js','w') do |file|
# closure = Closure::Compiler.new(:compilation_level => 'ADVANCED_OPTIMIZATIONS')
closure = Closure::Compiler.new
- file.puts closure.compile(File.open('public/javascripts/joined.js', 'r'))
+ file.puts closure.compile(File.open('source/javascripts/joined.js', 'r'))
end
Oops, something went wrong.

0 comments on commit d32e3ed

Please sign in to comment.