refactor debugger for instantiation support

jlmakes · jlmakes · commit 7e5d9faa9357 · 2017-08-06T16:42:23.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,7 +14,7 @@ and this project tries its best to use [Semantic Versioning](http://semver.org/)
 - ScrollReveal removes generated styles after reveals complete when `options.reset` is `false`. [#292](https://github.com/jlmakes/scrollreveal/issues/292)
 - New `clean()` method removes specific generated styles and event listeners. [#227](https://github.com/jlmakes/scrollreveal/issues/227)
 - New `destroy()` method removes all generated styles and event listeners. [#227](https://github.com/jlmakes/scrollreveal/issues/227)
-- New `debug` instance property toggles error messages in console. [#351](https://github.com/jlmakes/scrollreveal/issues/351)
+- New `debug` static property toggles error messages in console. [#351](https://github.com/jlmakes/scrollreveal/issues/351)
 - Instance methods now accept native arrays of HTML elements.
 
 ### Changed
diff --git a/src/instance/constructor.js b/src/instance/constructor.js
@@ -28,13 +28,6 @@ export default function ScrollReveal (options = {}) {
 		return new ScrollReveal(options)
 	}
 
-	Object.defineProperty(this, 'debug', {
-		get: () => _debug || false,
-		set: value => {
-			if (typeof value === 'boolean') _debug = value
-		},
-	})
-
 	if (!ScrollReveal.isSupported()) {
 		logger.call(this, 'Instantiation aborted.', 'This browser is not supported.')
 		return noop
@@ -100,10 +93,6 @@ export default function ScrollReveal (options = {}) {
 	return _instance ? _instance : _instance = this
 }
 
-<<<<<<< Updated upstream
-ScrollReveal.isSupported = () => transformSupported() && transitionSupported()
-
-=======
 /**
  * Static members are available immediately during instantiation,
  * so debugging and browser support details are handled here.
@@ -123,7 +112,6 @@ ScrollReveal.isSupported = () => transformSupported() && transitionSupported()
  * The primary API is comprised
  * of these instance methods:
  */
->>>>>>> Stashed changes
 ScrollReveal.prototype.clean = clean
 ScrollReveal.prototype.destroy = destroy
 ScrollReveal.prototype.reveal = reveal
diff --git a/src/utils/core.js b/src/utils/core.js
@@ -117,7 +117,7 @@ export function getScrolled (container) {
 
 
 export function logger (message, ...details) {
-	if (this.debug && console) {
+	if (this.constructor.debug && console) {
 		let report = `ScrollReveal: ${message}`
 		details.forEach(detail => report += `\n  - ${detail}`)
 		console.log(report) // eslint-disable-line no-console
diff --git a/test/instance/constructor.spec.js b/test/instance/constructor.spec.js
@@ -75,6 +75,19 @@ describe('ScrollReveal', () => {
 			ScrollReveal({ duration: 5000 })
 			expect(ScrollReveal().defaults.duration).to.equal(5000)
 		})
+
+		it('should have a static `debug` property', () => {
+			expect(ScrollReveal.debug).to.exist
+			expect(ScrollReveal.debug).to.be.a('boolean')
+		})
+
+		it('should only accept boolean values for static `debug` property', () => {
+			ScrollReveal.debug = null
+			expect(ScrollReveal.debug).to.exist
+			expect(ScrollReveal.debug).to.be.a('boolean')
+			ScrollReveal.debug = true
+			expect(ScrollReveal.debug).to.be.true
+		})
 	})
 
 	describe('Instance', () => {
@@ -101,24 +114,6 @@ describe('ScrollReveal', () => {
 			expect(sr.sync).to.be.a('function')
 		})
 
-		it('should have a `debug` property', () => {
-			expect(sr.debug).to.exist
-			expect(sr.debug).to.be.a('boolean')
-		})
-
-		it('should have a `debug` property', () => {
-			expect(sr.debug).to.exist
-			expect(sr.debug).to.be.a('boolean')
-		})
-
-		it('should only accept boolean values for `debug` property', () => {
-			sr.debug = null
-			expect(sr.debug).to.exist
-			expect(sr.debug).to.be.a('boolean')
-			sr.debug = true
-			expect(sr.debug).to.be.true
-		})
-
 		it('should have a `delegate` property', () => {
 			expect(sr.delegate).to.exist
 			expect(sr.delegate).to.be.a('function')
diff --git a/test/utils/core.spec.js b/test/utils/core.spec.js
@@ -93,9 +93,10 @@ describe('Core Utilities', () => {
 
 	describe('logger()', () => {
 
+		const mock = { constructor: { debug: true } }
+
 		let spy
 		let stub
-		let mock = { debug: true }
 
 		before('stub console log', () => {
 			spy = sinon.spy()
@@ -117,8 +118,6 @@ describe('Core Utilities', () => {
 			expect(spy).to.have.been.calledWith('ScrollReveal: message\n  - detail one\n  - detail two')
 		})
 
-		after('restore console log', () => {
-			stub.restore()
-		})
+		after('restore console log', () => stub.restore())
 	})
 })
