Skip to content
This repository has been archived by the owner on Sep 23, 2020. It is now read-only.

Commit

Permalink
Various fixies.
Browse files Browse the repository at this point in the history
  • Loading branch information
@JeremyFagis
JeremyFagis committed Jun 18, 2015
1 parent 2fa7360 commit fee46ba
Show file tree
Hide file tree
Showing 9 changed files with 38 additions and 61 deletions.
22 changes: 0 additions & 22 deletions LICENSE
View file

This file was deleted.

16 changes: 8 additions & 8 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,10 @@ $('.dropify').dropify();
```javascript
$('.dropify').dropify({
messages: {
defaultMessage: 'Drag and drop a file here or click',
replaceMessage: 'Drag and drop or click to replace',
removeMessage: 'Remove',
errorMessage: 'Sorry, this file is too large'
'default': 'Drag and drop a file here or click',
'replace': 'Drag and drop or click to replace',
'remove': 'Remove',
'error': 'Sorry, this file is too large'

}
}
Expand All @@ -108,11 +108,11 @@ $('.dropify').dropify({
$('.dropify').dropify({
tpl: {
wrap: '<div class="dropify-wrapper"></div>',
message: '<div class="dropify-message"><span class="file-icon" /> <p>defaultMessage</p></div>',
preview: '<div class="dropify-preview"><span class="dropify-render"></span><div class="dropify-infos"><div class="dropify-infos-inner"><p class="dropify-infos-message">replaceMessage</p></div></div></div>',
message: '<div class="dropify-message"><span class="file-icon" /> <p>{{ default }}</p></div>',
preview: '<div class="dropify-preview"><span class="dropify-render"></span><div class="dropify-infos"><div class="dropify-infos-inner"><p class="dropify-infos-message">{{ replace }}</p></div></div></div>',
filename: '<p class="dropify-filename"><span class="file-icon"></span> <span class="dropify-filename-inner"></span></p>',
clearButton: '<button type="button" class="dropify-clear">removeMessage</button>',
error: '<p class="dropify-error">errorMessage</p>'
clearButton: '<button type="button" class="dropify-clear">{{ remove }}</button>',
error: '<p class="dropify-error">{{ error }}</p>'
}
}
```
2 changes: 1 addition & 1 deletion dist/css/demo.css
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!
* =============================================================
* dropify v0.1.1 - Override your input files with style.
* dropify v0.1.2 - Override your input files with style.
* https://github.com/JeremyFagis/dropify
*
* (c) 2015 - Jeremy FAGIS <jeremy@fagis.fr> (http://fagis.fr)
Expand Down
2 changes: 1 addition & 1 deletion dist/css/dropify.css
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!
* =============================================================
* dropify v0.1.1 - Override your input files with style.
* dropify v0.1.2 - Override your input files with style.
* https://github.com/JeremyFagis/dropify
*
* (c) 2015 - Jeremy FAGIS <jeremy@fagis.fr> (http://fagis.fr)
Expand Down
2 changes: 1 addition & 1 deletion dist/css/dropify.min.css
View file

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

20 changes: 10 additions & 10 deletions dist/js/dropify.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!
* =============================================================
* dropify v0.1.1 - Override your input files with style.
* dropify v0.1.2 - Override your input files with style.
* https://github.com/JeremyFagis/dropify
*
* (c) 2015 - Jeremy FAGIS <jeremy@fagis.fr> (http://fagis.fr)
Expand All @@ -27,18 +27,18 @@ function Dropify(element, options) {
defaultFile: '',
maxFileSize: 0,
messages: {
defaultMessage: 'Drag and drop a file here or click',
replaceMessage: 'Drag and drop or click to replace',
removeMessage: 'Remove',
errorMessage: 'Sorry, this file is too large'
'default': 'Drag and drop a file here or click',
'replace': 'Drag and drop or click to replace',
'remove': 'Remove',
'error': 'Sorry, this file is too large'
},
tpl: {
wrap: '<div class="dropify-wrapper"></div>',
message: '<div class="dropify-message"><span class="file-icon" /> <p>defaultMessage</p></div>',
preview: '<div class="dropify-preview"><span class="dropify-render"></span><div class="dropify-infos"><div class="dropify-infos-inner"><p class="dropify-infos-message">replaceMessage</p></div></div></div>',
message: '<div class="dropify-message"><span class="file-icon" /> <p>{{ default }}</p></div>',
preview: '<div class="dropify-preview"><span class="dropify-render"></span><div class="dropify-infos"><div class="dropify-infos-inner"><p class="dropify-infos-message">{{ replace }}</p></div></div></div>',
filename: '<p class="dropify-filename"><span class="file-icon"></span> <span class="dropify-filename-inner"></span></p>',
clearButton: '<button type="button" class="dropify-clear">removeMessage</button>',
error: '<p class="dropify-error">errorMessage</p>'
clearButton: '<button type="button" class="dropify-clear">{{ remove }}</button>',
error: '<p class="dropify-error">{{ error }}</p>'
}
};

Expand Down Expand Up @@ -210,7 +210,7 @@ Dropify.prototype.translate = function()
{
for (var name in this.settings.tpl) {
for (var key in this.settings.messages) {
this.settings.tpl[name] = this.settings.tpl[name].replace(key, this.settings.messages[key]);
this.settings.tpl[name] = this.settings.tpl[name].replace('{{ ' + key + ' }}', this.settings.messages[key]);
}
}
};
Expand Down
4 changes: 2 additions & 2 deletions dist/js/dropify.min.js
View file

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

13 changes: 6 additions & 7 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,22 @@
{
"name": "dropify",
"description": "Override your input files with style.",
"version": "0.1.1",
"version": "0.1.2",
"homepage": "https://github.com/JeremyFagis/dropify",
"author": "Jeremy FAGIS <jeremy@fagis.fr> (http://fagis.fr)",
"repository": {
"type": "git",
"url": "https://github.com/JeremyFagis/dropify"
},
"licenses": [
{
"type": "MIT",
"url": "https://raw.githubusercontent.com/JeremyFagis/dropify/master/LICENSE"
}
],
"license": "MIT",
"bugs": {
"url": "https://github.com/JeremyFagis/dropify/issues"
},
"main": "dist/js/dropify.js",
"dependencies": {
"jquery": "*"
},
"devDependencies": {
"gulp": "^3.8.11",
"gulp-autoprefixer": "^2.1.0",
"gulp-header": "^1.2.2",
Expand Down
18 changes: 9 additions & 9 deletions src/js/dropify.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,18 @@ function Dropify(element, options) {
defaultFile: '',
maxFileSize: 0,
messages: {
defaultMessage: 'Drag and drop a file here or click',
replaceMessage: 'Drag and drop or click to replace',
removeMessage: 'Remove',
errorMessage: 'Sorry, this file is too large'
'default': 'Drag and drop a file here or click',
'replace': 'Drag and drop or click to replace',
'remove': 'Remove',
'error': 'Sorry, this file is too large'
},
tpl: {
wrap: '<div class="dropify-wrapper"></div>',
message: '<div class="dropify-message"><span class="file-icon" /> <p>defaultMessage</p></div>',
preview: '<div class="dropify-preview"><span class="dropify-render"></span><div class="dropify-infos"><div class="dropify-infos-inner"><p class="dropify-infos-message">replaceMessage</p></div></div></div>',
message: '<div class="dropify-message"><span class="file-icon" /> <p>{{ default }}</p></div>',
preview: '<div class="dropify-preview"><span class="dropify-render"></span><div class="dropify-infos"><div class="dropify-infos-inner"><p class="dropify-infos-message">{{ replace }}</p></div></div></div>',
filename: '<p class="dropify-filename"><span class="file-icon"></span> <span class="dropify-filename-inner"></span></p>',
clearButton: '<button type="button" class="dropify-clear">removeMessage</button>',
error: '<p class="dropify-error">errorMessage</p>'
clearButton: '<button type="button" class="dropify-clear">{{ remove }}</button>',
error: '<p class="dropify-error">{{ error }}</p>'
}
};

Expand Down Expand Up @@ -192,7 +192,7 @@ Dropify.prototype.translate = function()
{
for (var name in this.settings.tpl) {
for (var key in this.settings.messages) {
this.settings.tpl[name] = this.settings.tpl[name].replace(key, this.settings.messages[key]);
this.settings.tpl[name] = this.settings.tpl[name].replace('{{ ' + key + ' }}', this.settings.messages[key]);
}
}
};
Expand Down

0 comments on commit fee46ba

Please sign in to comment.