From 7adb0264724b89c762f9f9a670e20f155dfd51ae Mon Sep 17 00:00:00 2001
From: Arunas Ruksnaitis <github@ruksnaitis.com>
Date: Tue, 28 Apr 2015 16:02:44 -0700
Subject: [PATCH] refs #18533, convert dojox/lang/functional zip.js and
 curry.js to AMD
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Squashed commit of the following:

commit a475eec60460d235fe0ebc0085a394ce19a55706
Author: Arūnas Rukšnaitis <github@ruksnaitis.com>
Date:   Tue Apr 28 20:27:36 2015 +0100

    #18533 dojox/lang/functional zip.js and curry.js in AMD style (broken in 1.10.4)
---
 dojox.profile.js         |  2 +-
 lang/functional/curry.js | 14 +++++---------
 lang/functional/zip.js   | 10 ++++------
 3 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/dojox.profile.js b/dojox.profile.js
index 3c558d87a1..b55e512ac7 100644
--- a/dojox.profile.js
+++ b/dojox.profile.js
@@ -22,7 +22,7 @@ var profile = (function(){
 			"help",
 			"image/(Gallery|SlideShow|ThumbnailPicker)",
 			"jq",
-			"lang/(aspect|async|docs|observable|oo|typed|functional/(binrec|curry|linrec|listcomp|multirec|numrec|tailrec|util|zip))",
+			"lang/(aspect|async|docs|observable|oo|typed|functional/(binrec|linrec|listcomp|multirec|numrec|tailrec|util))",
 			"layout/(BorderContainer|dnd|ext-dijit)",
 			"mobile/app/",
 			"rails",
diff --git a/lang/functional/curry.js b/lang/functional/curry.js
index c2f997cfef..baa5cba987 100644
--- a/lang/functional/curry.js
+++ b/lang/functional/curry.js
@@ -1,6 +1,5 @@
-dojo.provide("dojox.lang.functional.curry");
-
-dojo.require("dojox.lang.functional.lambda");
+define(["dojo/_base/lang", "./lambda"],
+	function(lang, df){
 
 // This module adds high-level functions and related constructs:
 //	- currying and partial functions
@@ -13,10 +12,7 @@ dojo.require("dojox.lang.functional.lambda");
 
 // Defined methods:
 //	- take any valid lambda argument as the functional argument
-
-(function(){
-	var df = dojox.lang.functional, ap = Array.prototype;
-
+        var ap = Array.prototype;
 	var currying = function(/*Object*/ info){
 		return function(){	// Function
 			var args = info.args.concat(ap.slice.call(arguments, 0));
@@ -27,7 +23,7 @@ dojo.require("dojox.lang.functional.lambda");
 		};
 	};
 
-	dojo.mixin(df, {
+	lang.mixin(df, {
 		// currying and partial functions
 		curry: function(/*Function|String|Array*/ f, /*Number?*/ arity){
 			// summary:
@@ -95,4 +91,4 @@ dojo.require("dojox.lang.functional.lambda");
 			};
 		}
 	});
-})();
+});
diff --git a/lang/functional/zip.js b/lang/functional/zip.js
index 3556702177..56e783ce32 100644
--- a/lang/functional/zip.js
+++ b/lang/functional/zip.js
@@ -1,4 +1,5 @@
-dojo.provide("dojox.lang.functional.zip");
+define(["dojo/_base/lang", "./lambda"],
+	function(lang, df){
 
 // This module adds high-level functions and related constructs:
 //	- zip combiners
@@ -6,10 +7,7 @@ dojo.provide("dojox.lang.functional.zip");
 // Defined methods:
 //	- operate on dense arrays
 
-(function(){
-	var df = dojox.lang.functional;
-
-	dojo.mixin(df, {
+	lang.mixin(df, {
 		// combiners
 		zip: function(){
 			// summary:
@@ -41,4 +39,4 @@ dojo.provide("dojox.lang.functional.zip");
 			return df.zip.apply(null, a);	// Array
 		}
 	});
-})();
+});