diff --git a/Gemfile b/Gemfile index a387f2847..cb1310d23 100644 --- a/Gemfile +++ b/Gemfile @@ -94,8 +94,6 @@ gem 'font-awesome-rails' gem 'sitemap_generator' -gem 'codemirror-rails', '~> 4.0' - group :production do gem "airbrake", '~> 3.1.2' gem 'bluepill', '~> 0.0.60', require: false diff --git a/Gemfile.lock b/Gemfile.lock index 62a955363..6b9606ea3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -128,8 +128,6 @@ GEM activesupport (>= 3.0) cocaine (0.5.3) climate_control (>= 0.0.3, < 1.0) - codemirror-rails (4.0) - railties (>= 3.0, < 5) coderay (1.1.0) coffee-rails (4.0.1) coffee-script (>= 2.2.0) @@ -539,7 +537,6 @@ DEPENDENCIES capistrano capistrano_colors charlock_holmes (~> 0.6.9) - codemirror-rails (~> 4.0) coffee-rails (~> 4.0.1) compass-rails (~> 1.1.6) creole diff --git a/app/assets/javascripts/new_application.js b/app/assets/javascripts/new_application.js index 490e6317a..c05aadfb3 100644 --- a/app/assets/javascripts/new_application.js +++ b/app/assets/javascripts/new_application.js @@ -18,19 +18,4 @@ //= require_tree ./angular-new //= require loading-bar - -//= require codemirror -// ### TODO require all files in codemirror/modes ### -//= require codemirror/modes/ruby -//= require codemirror/modes/javascript -//= require codemirror/modes/markdown - -$(document).ready(function() { - window.CodeMirrorRun = function(code) { - //CodeMirror.runMode(code.innerHTML.replace(/&/gi, '&').replace(/</gi, '<').replace(/>/gi, '>'), code.className, code); - CodeMirror.runMode(code.innerHTML, 'markdown', code); - } - - $('.md_and_cm').each(function (code) { CodeMirrorRun(this); }); - -}); +//= require ng-table diff --git a/app/assets/stylesheets/new_application.css.scss b/app/assets/stylesheets/new_application.css.scss index bf1163bfe..aa6955809 100644 --- a/app/assets/stylesheets/new_application.css.scss +++ b/app/assets/stylesheets/new_application.css.scss @@ -10,4 +10,3 @@ $navbar-default-link-hover-color: #CEE7FF; @import "timeline"; @import "font-awesome"; @import "loading-bar"; -@import "codemirror";