Renamed components to lib in the JS project, as Ember has components and they mean something different.

This commit is contained in:
Robin Ward
2013-10-24 12:36:46 -04:00
parent 3909f93a7e
commit 9adcd1579d
41 changed files with 15 additions and 10 deletions

View File

@ -7,7 +7,7 @@
//= require ./env //= require ./env
// probe framework first // probe framework first
//= require ./discourse/components/probes.js //= require ./discourse/lib/probes.js
// Externals we need to load first // Externals we need to load first

View File

@ -43,11 +43,11 @@
// Stuff we need to load first // Stuff we need to load first
//= require ./discourse/mixins/scrolling //= require ./discourse/mixins/scrolling
//= require_tree ./discourse/mixins //= require_tree ./discourse/mixins
//= require ./discourse/components/markdown //= require ./discourse/lib/markdown
//= require ./discourse/components/computed //= require ./discourse/lib/computed
//= require ./discourse/views/view //= require ./discourse/views/view
//= require ./discourse/views/container_view //= require ./discourse/views/container_view
//= require ./discourse/components/debounce //= require ./discourse/lib/debounce
//= require ./discourse/models/model //= require ./discourse/models/model
//= require ./discourse/models/user_action //= require ./discourse/models/user_action
//= require ./discourse/models/composer //= require ./discourse/models/composer
@ -63,9 +63,10 @@
//= require ./discourse/dialects/dialect //= require ./discourse/dialects/dialect
//= require_tree ./discourse/dialects //= require_tree ./discourse/dialects
//= require_tree ./discourse/controllers //= require_tree ./discourse/controllers
//= require_tree ./discourse/components //= require_tree ./discourse/lib
//= require_tree ./discourse/models //= require_tree ./discourse/models
//= require_tree ./discourse/views //= require_tree ./discourse/views
//= require_tree ./discourse/components
//= require_tree ./discourse/helpers //= require_tree ./discourse/helpers
//= require_tree ./discourse/templates //= require_tree ./discourse/templates
//= require_tree ./discourse/routes //= require_tree ./discourse/routes

View File

@ -2,6 +2,9 @@
"app/assets/javascripts/discourse/components/*.js": { "app/assets/javascripts/discourse/components/*.js": {
"command": "dcomponent" "command": "dcomponent"
}, },
"app/assets/javascripts/discourse/lib/*.js": {
"command": "dlib"
},
"app/assets/javascripts/discourse/routes/*.js": { "app/assets/javascripts/discourse/routes/*.js": {
"command": "droute" "command": "droute"
}, },

View File

@ -70,8 +70,8 @@ module PrettyText
"vendor/assets/javascripts/better_markdown.js", "vendor/assets/javascripts/better_markdown.js",
"app/assets/javascripts/defer/html-sanitizer-bundle.js", "app/assets/javascripts/defer/html-sanitizer-bundle.js",
"app/assets/javascripts/discourse/dialects/dialect.js", "app/assets/javascripts/discourse/dialects/dialect.js",
"app/assets/javascripts/discourse/components/utilities.js", "app/assets/javascripts/discourse/lib/utilities.js",
"app/assets/javascripts/discourse/components/markdown.js") "app/assets/javascripts/discourse/lib/markdown.js")
Dir["#{Rails.root}/app/assets/javascripts/discourse/dialects/**.js"].each do |dialect| Dir["#{Rails.root}/app/assets/javascripts/discourse/dialects/**.js"].each do |dialect|
unless dialect =~ /\/dialect\.js$/ unless dialect =~ /\/dialect\.js$/

View File

@ -26,8 +26,8 @@ test("new user cannot upload images", function() {
Discourse.SiteSettings.newuser_max_images = 0; Discourse.SiteSettings.newuser_max_images = 0;
this.stub(bootbox, "alert"); this.stub(bootbox, "alert");
ok(!validUpload([{name: "image.png"}])); ok(!validUpload([{name: "image.png"}]), 'the upload is not valid');
ok(bootbox.alert.calledWith(I18n.t('post.errors.image_upload_not_allowed_for_new_user'))); ok(bootbox.alert.calledWith(I18n.t('post.errors.image_upload_not_allowed_for_new_user')), 'the alert is called');
}); });
test("new user cannot upload attachments", function() { test("new user cannot upload attachments", function() {

View File

@ -6,7 +6,7 @@
//= require ../../app/assets/javascripts/preload_store.js //= require ../../app/assets/javascripts/preload_store.js
// probe framework first // probe framework first
//= require ../../app/assets/javascripts/discourse/components/probes.js //= require ../../app/assets/javascripts/discourse/lib/probes.js
// Externals we need to load first // Externals we need to load first
//= require development/jquery-2.0.3.js //= require development/jquery-2.0.3.js
@ -65,6 +65,7 @@
//= require helpers/assertions //= require helpers/assertions
//= require_tree ./fixtures //= require_tree ./fixtures
//= require_tree ./lib
//= require_tree . //= require_tree .
//= require_self //= require_self
//= require jshint_all //= require jshint_all