Skip to content
This repository has been archived by the owner on Jun 16, 2022. It is now read-only.

Commit

Permalink
Renames /payloads -> /dist.
Browse files Browse the repository at this point in the history
  • Loading branch information
davidmcclure committed Apr 19, 2014
1 parent 13db34c commit 0ff1ace
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 23 deletions.
32 changes: 16 additions & 16 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ module.exports = function(grunt) {

clean: {

payloads: [
paths.payloads.js.shared,
paths.payloads.css.shared
dist: [
paths.dist.js.shared,
paths.dist.css.shared
],

fixtures: [
Expand All @@ -72,22 +72,22 @@ module.exports = function(grunt) {
paths.vendor.moment,
paths.src.js.shared+'/public/*.js'
],
dest: paths.payloads.js.shared+'/simile-public.js'
dest: paths.dist.js.shared+'/simile-public.js'
},

simile_editor: {
src: [
'<%= concat.simile_public.src %>',
paths.src.js.shared+'/editor/*.js'
],
dest: paths.payloads.js.shared+'/simile-editor.js'
dest: paths.dist.js.shared+'/simile-editor.js'
},

simile_public_css: {
src: [
paths.payloads.css.shared+'/simile-public.css'
paths.dist.css.shared+'/simile-public.css'
],
dest: paths.payloads.css.shared+'/simile-editor.css'
dest: paths.dist.css.shared+'/simile-editor.css'
}

},
Expand All @@ -96,12 +96,12 @@ module.exports = function(grunt) {

simile_public: {
src: '<%= concat.simile_public.dest %>',
dest: paths.payloads.js.shared+'/simile-public.js'
dest: paths.dist.js.shared+'/simile-public.js'
},

simile_editor: {
src: '<%= concat.simile_editor.dest %>',
dest: paths.payloads.js.shared+'/simile-editor.js'
dest: paths.dist.js.shared+'/simile-editor.js'
}

},
Expand All @@ -110,7 +110,7 @@ module.exports = function(grunt) {

compile: {
src: paths.src.styl.shared+'/public/*.styl',
dest: paths.payloads.css.shared+'/simile-public.css'
dest: paths.dist.css.shared+'/simile-public.css'
}

},
Expand All @@ -121,7 +121,7 @@ module.exports = function(grunt) {
files: [{
cwd: 'bower_components/simile/',
src: '**',
dest: paths.payloads.js.shared+'/simile',
dest: paths.dist.js.shared+'/simile',
flatten: false,
expand: true
}]
Expand Down Expand Up @@ -163,16 +163,16 @@ module.exports = function(grunt) {
host: 'http://localhost:1337',
template: 'Neatline/'+nlPaths.jasmine+'/runner.tmpl',
helpers: [
'Neatline/'+nlPaths.jasmine+'/payloads/vendor.js',
'Neatline/'+nlPaths.jasmine+'/dist/vendor.js',
paths.jasmine+'/helpers/*.js',
paths.jasmine+'/assertions/*.js'
]
},

neatline: {
src: [
'Neatline/'+nlPaths.payloads.js.shared+'/neatline-public.js',
paths.payloads.js.shared+'/simile-public.js'
'Neatline/'+nlPaths.dist.js.shared+'/neatline-public.js',
paths.dist.js.shared+'/simile-public.js'
],
options: {
specs: paths.jasmine+'/tests/neatline/**/*.spec.js'
Expand All @@ -181,8 +181,8 @@ module.exports = function(grunt) {

editor: {
src: [
'Neatline/'+nlPaths.payloads.js.shared+'/neatline-editor.js',
paths.payloads.js.shared+'/simile-editor.js'
'Neatline/'+nlPaths.dist.js.shared+'/neatline-editor.js',
paths.dist.js.shared+'/simile-editor.js'
],
options: {
specs: paths.jasmine+'/tests/editor/**/*.spec.js'
Expand Down
8 changes: 4 additions & 4 deletions NeatlineSimilePlugin.php
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,8 @@ public function hookNeatlinePublicStatic($args)
{
if ($args['exhibit']->hasWidget(self::ID)) {
simile_queueSimileApi();
queue_css_file('payloads/simile-public');
queue_js_file('payloads/simile-public');
queue_css_file('dist/simile-public');
queue_js_file('dist/simile-public');
}
}

Expand All @@ -113,8 +113,8 @@ public function hookNeatlineEditorStatic($args)
{
if ($args['exhibit']->hasWidget(self::ID)) {
simile_queueSimileApi();
queue_css_file('payloads/simile-public');
queue_js_file('payloads/simile-editor');
queue_css_file('dist/simile-public');
queue_js_file('dist/simile-editor');
}
}

Expand Down
6 changes: 3 additions & 3 deletions paths.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
}
},

"payloads": {
"dist": {
"js": {
"shared": "views/shared/javascripts/payloads"
"shared": "views/shared/javascripts/dist"
},
"css": {
"shared": "views/shared/css/payloads"
"shared": "views/shared/css/dist"
}
},

Expand Down
1 change: 1 addition & 0 deletions views/shared/css/dist/simile-editor.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions views/shared/css/dist/simile-public.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions views/shared/javascripts/dist/simile-editor.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions views/shared/javascripts/dist/simile-public.js

Large diffs are not rendered by default.

0 comments on commit 0ff1ace

Please sign in to comment.