Permalink
Browse files

Added border.png to images

  • Loading branch information...
ingemaradahl committed Jan 29, 2013
1 parent 0ca9d30 commit be618098a7582a23a22049fc59879cf33b3512c1
Showing with 5 additions and 3 deletions.
  1. BIN images/border.png
  2. +1 −1 js/app.js
  3. +2 −0 js/config.js
  4. +2 −2 js/editor.js
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
@@ -786,7 +786,7 @@ function Inputs() {
var input = $(templates.inputs.texture.input({ value: value }));
input.autocomplete({
- source: Object.keys(config.images).concat(['images/lena.png']),
+ source: Object.keys(config.images),
select: function(e) { onUpdate(e, true); }
});
var preview = $(templates.inputs.texture.preview());
View
@@ -47,5 +47,7 @@ var config = {
, 'images/yellow_train.jpg': { author: "Bart", attribution: "http://www.flickr.com/photos/89246112@N00/8352439289/in/photostream/", description: "Yellow train" }
, 'images/bridge.jpg': { author: "Railways of Australia", attribution: "http://www.flickr.com/photos/railwayofaustralia/8425520163/in/photostream/", description: "Asplin Bridge" }
, 'images/waterfall.jpg': { author: "aksynth", attribution: "http://www.flickr.com/photos/23313207@N00/8426609538/sizes/l/in/photostream/", description: "Waterfall" }
+ , 'images/border.png': null
+ , 'images/lena.png': null
}
};
View
@@ -650,8 +650,8 @@ function Editor() {
// Build attribution list
var attribution = about.find("#attribution");
for (var url in config.images) {
- attribution.append($(templates.attribution(config.images[url])));
-
+ if (config.images[url])
+ attribution.append($(templates.attribution(config.images[url])));
}
};

0 comments on commit be61809

Please sign in to comment.