marionette-client - npm Package Compare versions

Comparing version 1.1.5 to 1.1.6

lib/marionette/client.js

		@@ -34,3 +34,2 @@ (function(module, ns) {


		/**
		@@ -854,9 +853,17 @@ * Helper to set scope and state on a given client.
		* @chainable
		* @param {String\|Marionette.Element} id iframe id or element.
		* @param {String\|Marionette.Element} [id] iframe id or element.
		* If you call this function without an argument, it will switch to the top-level frame.
		* @param {Object} [options] options to be mixed in the command parameters.
		* @param {Boolean} [options.focus] If 'true', will switch the focus to the frame.
		* @param {Function} callback called with boolean.
		*
		*/
		switchToFrame: function switchToFrame(id, callback) {
		switchToFrame: function switchToFrame(id, options, callback) {
		if (typeof(id) === 'function') {
		callback = id;
		id = null;
		options = null;
		} else if (typeof(options) === 'function') {
		callback = options;
		options = null;
		}
		@@ -877,2 +884,9 @@
		}

		if (options) {
		for (var key in options) {
		cmd.parameters[key] = options[key];
		}
		}

		return this._sendCommand(cmd, 'ok', callback);
		@@ -879,0 +893,0 @@ },

package.json

		{
		"name": "marionette-client",
		"version": "1.1.5",
		"version": "1.1.6",
		"main": "lib/marionette/index",
		@@ -5,0 +5,0 @@ "description": "Marionette Javascript Client",

New alerts