From db4e3857a5f2354af2508e3e1b540b60cf00aaf5 Mon Sep 17 00:00:00 2001 From: JC Brand Date: Fri, 1 Mar 2019 08:49:39 +0100 Subject: [PATCH 1/2] Avoid setting `this.el` to child node of element In `setElement`, when an element containing child nodes is passed in, we still want to set the entire element, and not `element[0]`. --- backbone.nativeview.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backbone.nativeview.js b/backbone.nativeview.js index cc6990b..ea0c41a 100644 --- a/backbone.nativeview.js +++ b/backbone.nativeview.js @@ -87,7 +87,7 @@ } else { this.el = document.querySelector(element); } - } else if (element && element.length) { + } else if (element && !_.isElement(element) && element.length) { this.el = element[0]; } else { this.el = element; From 5997c8197ca594e6b8469447f28310c78bd1d95e Mon Sep 17 00:00:00 2001 From: JC Brand Date: Fri, 1 Mar 2019 09:41:27 +0100 Subject: [PATCH 2/2] Make sure underscore is loaded --- backbone.nativeview.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/backbone.nativeview.js b/backbone.nativeview.js index ea0c41a..127af82 100644 --- a/backbone.nativeview.js +++ b/backbone.nativeview.js @@ -7,10 +7,10 @@ // https://github.com/akre54/Backbone.NativeView (function (factory) { - if (typeof define === 'function' && define.amd) { define(['backbone'], factory); - } else if (typeof module === 'object') { module.exports = factory(require('backbone')); - } else { factory(Backbone); } -}(function (Backbone) { + if (typeof define === 'function' && define.amd) { define(['underscore', 'backbone'], factory); + } else if (typeof module === 'object') { module.exports = factory(require('underscore'), require('backbone')); + } else { factory(_, Backbone); } +}(function (_, Backbone) { // Cached regex to match an opening '<' of an HTML tag, possibly left-padded // with whitespace. var paddedLt = /^\s*