Added border.png to images

ingemaradahl · Jan 29, 2013 · be61809 · be61809
1 parent 0ca9d30
commit be61809
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/images/border.png b/images/border.png
diff --git a/js/app.js b/js/app.js
@@ -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());

diff --git a/js/config.js b/js/config.js
@@ -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
 	}
 };
diff --git a/js/editor.js b/js/editor.js
@@ -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])));
 		}
 
 	};