Merge branch 'master' into gh-pages

MyXoToD · MyXoToD · commit 28110a4eb427 · 2016-06-28T11:01:45.000+02:00
Conflicts:
	assets/css/application.css
	assets/css/application.scss
diff --git a/assets/css/application.css b/assets/css/application.css
@@ -39,8 +39,8 @@ pre {
   font-family: 'Source Code Pro', sans-serif;
   font-size: 14px;
   border-radius: 15px;
-  width: 100%;
   overflow-x: scroll;
+  width: 100%;
   box-sizing: border-box;
   -o-box-sizing: border-box;
   -ms-box-sizing: border-box;
diff --git a/assets/css/application.scss b/assets/css/application.scss
@@ -47,8 +47,8 @@ pre {
   font-family: 'Source Code Pro', sans-serif;
   font-size: 14px;
   border-radius: 15px;
-  width: 100%;
   overflow-x: scroll;
+  width: 100%;
   box-sizing: border-box;
   -o-box-sizing: border-box;
   -ms-box-sizing: border-box;
diff --git a/assets/js/jquery.uploadPreview.js b/assets/js/jquery.uploadPreview.js
@@ -16,7 +16,7 @@
       if (window.File && window.FileList && window.FileReader) {
         if (typeof($(settings.input_field)) !== 'undefined' && $(settings.input_field) !== null) {
           $(settings.input_field).change(function() {
-            var files = event.target.files;
+            var files = this.files;
 
             if (files.length > 0) {
               var file = files[0];
@@ -67,4 +67,4 @@
       }
     }
   });
-})(jQuery);
+})(jQuery);
diff --git a/assets/js/jquery.uploadPreview.min.js b/assets/js/jquery.uploadPreview.min.js

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`if (window.File && window.FileList && window.FileReader) {`
`17`	`17`	`if (typeof($(settings.input_field)) !== 'undefined' && $(settings.input_field) !== null) {`
`18`	`18`	`$(settings.input_field).change(function() {`
`19`		`- var files = event.target.files;`
	`19`	`+ var files = this.files;`
`20`	`20`
`21`	`21`	`if (files.length > 0) {`
`22`	`22`	`var file = files[0];`
`@@ -67,4 +67,4 @@`
`67`	`67`	`}`
`68`	`68`	`}`
`69`	`69`	`});`
`70`		`-})(jQuery);`
	`70`	`+})(jQuery);`