diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-04-03 12:56:09 +0300 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-04-03 12:56:09 +0300 |
commit | 1eec1f4f20a13d8110757fb5027462346aa0a9fc (patch) | |
tree | 264a14549bd47344f925a6d082ea2ef47398586a | |
parent | a7ab029d22baec1aa6e5a095b5eac99a9ffebdaa (diff) | |
parent | 76c4421b26f2545f355d2bba6f573d5b0c780962 (diff) | |
download | gitlab-ce-1eec1f4f20a13d8110757fb5027462346aa0a9fc.tar.gz |
Merge branch 'master' of github.com:gitlabhq/gitlabhq
-rw-r--r-- | app/assets/javascripts/commit/file.js.coffee | 6 | ||||
-rw-r--r-- | app/assets/javascripts/commit/image-file.js.coffee | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/javascripts/commit/file.js.coffee b/app/assets/javascripts/commit/file.js.coffee index a45ee58d1b4..4db9116a9de 100644 --- a/app/assets/javascripts/commit/file.js.coffee +++ b/app/assets/javascripts/commit/file.js.coffee @@ -1,7 +1,7 @@ class CommitFile - + constructor: (file) -> if $('.image', file).length new ImageFile(file) - -this.CommitFile = CommitFile
\ No newline at end of file + +@CommitFile = CommitFile diff --git a/app/assets/javascripts/commit/image-file.js.coffee b/app/assets/javascripts/commit/image-file.js.coffee index f901a9e28ff..607b85eb45c 100644 --- a/app/assets/javascripts/commit/image-file.js.coffee +++ b/app/assets/javascripts/commit/image-file.js.coffee @@ -125,4 +125,4 @@ class ImageFile img.on 'load', => callback.call(this, domImg.naturalWidth, domImg.naturalHeight) -this.ImageFile = ImageFile
\ No newline at end of file +@ImageFile = ImageFile |