From 335fbe610649eac7d97ae7db3e908ae55a3d843e Mon Sep 17 00:00:00 2001 From: Samuel Georges Date: Sat, 13 Jun 2015 10:31:01 +1000 Subject: [PATCH] Touch ups --- .../backend/formwidgets/fileupload/assets/js/fileupload.js | 4 ++++ .../fileupload/assets/less/fileupload.filesingle.less | 7 +++---- .../formwidgets/recordfinder/assets/js/recordfinder.js | 4 ++-- modules/system/assets/ui/docs/foundation.md | 2 +- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/modules/backend/formwidgets/fileupload/assets/js/fileupload.js b/modules/backend/formwidgets/fileupload/assets/js/fileupload.js index 1dba9f304..82ef73a3a 100644 --- a/modules/backend/formwidgets/fileupload/assets/js/fileupload.js +++ b/modules/backend/formwidgets/fileupload/assets/js/fileupload.js @@ -57,7 +57,11 @@ } FileUpload.prototype.dispose = function() { + + this.$el.off('click', '.upload-object.is-success', this.proxy(this.onClickSuccessObject)) this.$el.off('click', '.upload-object.is-error', this.proxy(this.onClickErrorObject)) + this.$el.off('click', '.upload-remove-button', this.proxy(this.onRemoveObject)) + this.$el.off('dispose-control', this.proxy(this.dispose)) this.$el.removeData('oc.fileUpload') diff --git a/modules/backend/formwidgets/fileupload/assets/less/fileupload.filesingle.less b/modules/backend/formwidgets/fileupload/assets/less/fileupload.filesingle.less index 96a9090be..bcab0858a 100644 --- a/modules/backend/formwidgets/fileupload/assets/less/fileupload.filesingle.less +++ b/modules/backend/formwidgets/fileupload/assets/less/fileupload.filesingle.less @@ -61,9 +61,9 @@ .info { margin-left: 34px; margin-right: 15%; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; h4, p { display: inline; @@ -88,7 +88,6 @@ top: 50%; margin-top: -2px; right: 5px; - } .meta { diff --git a/modules/backend/formwidgets/recordfinder/assets/js/recordfinder.js b/modules/backend/formwidgets/recordfinder/assets/js/recordfinder.js index f50e19ee6..4930c2417 100644 --- a/modules/backend/formwidgets/recordfinder/assets/js/recordfinder.js +++ b/modules/backend/formwidgets/recordfinder/assets/js/recordfinder.js @@ -1,6 +1,6 @@ /* * RecordFinder plugin - * + * * Data attributes: * - data-control="recordfinder" - enables the plugin on an element * - data-option="value" - an option with a value @@ -8,7 +8,7 @@ * JavaScript API: * $('a#someElement').recordFinder({ option: 'value' }) * - * Dependences: + * Dependences: * - Some other plugin (filename.js) */ diff --git a/modules/system/assets/ui/docs/foundation.md b/modules/system/assets/ui/docs/foundation.md index 5d178b5fa..d659ddb02 100644 --- a/modules/system/assets/ui/docs/foundation.md +++ b/modules/system/assets/ui/docs/foundation.md @@ -215,7 +215,7 @@ We already have a boilerplate code for jQuery code. Disposable controls approach } // Add this only if required - $(document).render(function(){ + $(document).render(function (){ $('[data-some-disposable-control]').someDisposableControl() })