Commit 65695ece authored by Benjamin Fischer's avatar Benjamin Fischer
Browse files

Merge branch 'branches/windowManager' of...

Merge branch 'branches/windowManager' of hg::ssh:// into branches/windowManager
parents 31f280dc cca75812
......@@ -20,8 +20,8 @@ define(["jquery", "emitter", "text!../html/preview.html"], function($, Emitter,
this.shadowTmpl = "inset {0}px 0px #428cba";
this.allowedExtensions = ["png", "jpg", "jpeg", "bmp", "root"];
this.pictureExtensions = ["png", "jpg", "jpeg", "bmp"]
this.allowedExtensions = ["png", "jpg", "jpeg", "bmp"];
this.pictureExtensions = ["png", "jpg", "jpeg", "bmp"];
this.previewData = [];
......@@ -84,7 +84,7 @@ define(["jquery", "emitter", "text!../html/preview.html"], function($, Emitter,
self.inputFocused = true;
}).blur(function() {
self.previewChanged = true;
self.view.state.set("previewPath", this.value)
self.view.state.set("previewPath", this.value);
self.inputFocused = false;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment