From c0a11adbc5f7b24be2cdc537482a1a2ef7469669 Mon Sep 17 00:00:00 2001 From: Wojciech Zawistowski Date: Mon, 31 Mar 2014 21:56:19 +0200 Subject: [PATCH] Moves Markdown Editor from vendor to discourse. --- .jshintignore | 2 ++ .../assets/javascripts/discourse/lib}/Markdown.Editor.js | 0 app/assets/javascripts/vendor.js | 1 - test/javascripts/jshint_all.js.erb | 3 ++- 4 files changed, 4 insertions(+), 2 deletions(-) rename {vendor/assets/javascripts => app/assets/javascripts/discourse/lib}/Markdown.Editor.js (100%) diff --git a/.jshintignore b/.jshintignore index e990087263a..850b9e70670 100644 --- a/.jshintignore +++ b/.jshintignore @@ -1,4 +1,6 @@ app/assets/javascripts/defer/html-sanitizer-bundle.js +app/assets/javascripts/discourse/lib/Markdown.Editor.js +jsapp/lib/Markdown.Editor.js lib/javascripts/locale/ lib/javascripts/messageformat.js lib/javascripts/moment.js diff --git a/vendor/assets/javascripts/Markdown.Editor.js b/app/assets/javascripts/discourse/lib/Markdown.Editor.js similarity index 100% rename from vendor/assets/javascripts/Markdown.Editor.js rename to app/assets/javascripts/discourse/lib/Markdown.Editor.js diff --git a/app/assets/javascripts/vendor.js b/app/assets/javascripts/vendor.js index ed06b87727f..4a8d64d41fc 100644 --- a/app/assets/javascripts/vendor.js +++ b/app/assets/javascripts/vendor.js @@ -10,7 +10,6 @@ //= require_tree ./discourse/ember //= require LAB.js //= require Markdown.Converter.js -//= require Markdown.Editor.js //= require better_markdown.js //= require bootbox.js //= require bootstrap-alert.js diff --git a/test/javascripts/jshint_all.js.erb b/test/javascripts/jshint_all.js.erb index 7353f7cdf42..2edeeb5d3ef 100644 --- a/test/javascripts/jshint_all.js.erb +++ b/test/javascripts/jshint_all.js.erb @@ -120,4 +120,5 @@ qHint.sendRequest = function (url, callback) { "/app/assets/javascripts/", [/external\//, /defer\//, - /locales\//]) %> + /locales\//, + /Markdown\.Editor\.js/]) %>