Skip to content

Commit

Permalink
Fixed merge
Browse files Browse the repository at this point in the history
  • Loading branch information
@cneuwirt
cneuwirt committed May 18, 2015
2 parents 0afd1a0 + 8491af9 commit 498e198
Show file tree
Hide file tree
Showing 111 changed files with 6,436 additions and 3,823 deletions.
184 changes: 145 additions & 39 deletions demo/mytodo/app/scripts/miruken-ng-bundle.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7880,7 +7880,7 @@ new function () { // closure
*
*/
/**
* bluebird build version 2.9.24
* bluebird build version 2.9.25
* Features enabled: core, race, call_get, generators, map, nodeify, promisify, props, reduce, settle, some, cancel, using, filter, any, each, timers
*/
!function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{var f;"undefined"!=typeof window?f=window:"undefined"!=typeof global?f=global:"undefined"!=typeof self&&(f=self),f.Promise=e()}}(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof _dereq_=="function"&&_dereq_;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof _dereq_=="function"&&_dereq_;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(_dereq_,module,exports){
Expand Down Expand Up @@ -7968,6 +7968,7 @@ Async.prototype.throwLater = function(fn, arg) {

Async.prototype._getDomain = function() {};

if (!true) {
if (util.isNode) {
var EventsModule = _dereq_("events");

Expand All @@ -7983,31 +7984,32 @@ if (util.isNode) {
var descriptor =
Object.getOwnPropertyDescriptor(EventsModule, "usingDomains");

if (!descriptor.configurable) {
process.on("domainsActivated", function() {
Async.prototype._getDomain = domainGetter;
});
} else {
var usingDomains = false;
Object.defineProperty(EventsModule, "usingDomains", {
configurable: false,
enumerable: true,
get: function() {
return usingDomains;
},
set: function(value) {
if (usingDomains || !value) return;
usingDomains = true;
if (descriptor) {
if (!descriptor.configurable) {
process.on("domainsActivated", function() {
Async.prototype._getDomain = domainGetter;
util.toFastProperties(process);
process.emit("domainsActivated");
}
});
});
} else {
var usingDomains = false;
Object.defineProperty(EventsModule, "usingDomains", {
configurable: false,
enumerable: true,
get: function() {
return usingDomains;
},
set: function(value) {
if (usingDomains || !value) return;
usingDomains = true;
Async.prototype._getDomain = domainGetter;
util.toFastProperties(process);
process.emit("domainsActivated");
}
});
}
}


}
}
}

function AsyncInvokeLater(fn, receiver, arg) {
var domain = this._getDomain();
Expand Down Expand Up @@ -12957,32 +12959,64 @@ function isUndefined(arg) {
var process = module.exports = {};
var queue = [];
var draining = false;
var currentQueue;
var queueIndex = -1;

function cleanUpNextTick() {
draining = false;
if (currentQueue.length) {
queue = currentQueue.concat(queue);
} else {
queueIndex = -1;
}
if (queue.length) {
drainQueue();
}
}

function drainQueue() {
if (draining) {
return;
}
var timeout = setTimeout(cleanUpNextTick);
draining = true;
var currentQueue;

var len = queue.length;
while(len) {
currentQueue = queue;
queue = [];
var i = -1;
while (++i < len) {
currentQueue[i]();
while (++queueIndex < len) {
currentQueue[queueIndex].run();
}
queueIndex = -1;
len = queue.length;
}
currentQueue = null;
draining = false;
clearTimeout(timeout);
}

process.nextTick = function (fun) {
queue.push(fun);
var args = new Array(arguments.length - 1);
if (arguments.length > 1) {
for (var i = 1; i < arguments.length; i++) {
args[i - 1] = arguments[i];
}
}
queue.push(new Item(fun, args));
if (!draining) {
setTimeout(drainQueue, 0);
}
};

// v8 likes predictible objects
function Item(fun, array) {
this.fun = fun;
this.array = array;
}
Item.prototype.run = function () {
this.fun.apply(null, this.array);
};
process.title = 'browser';
process.browser = true;
process.env = {};
Expand Down Expand Up @@ -13012,7 +13046,7 @@ process.chdir = function (dir) {
process.umask = function() { return 0; };

},{}],20:[function(require,module,exports){
// Validate.js 0.7.0
// Validate.js 0.7.1

// (c) 2013-2015 Nicklas Ansman, 2013 Wrapp
// Validate.js may be freely distributed under the MIT license.
Expand Down Expand Up @@ -13069,8 +13103,8 @@ process.umask = function() { return 0; };
version: {
major: 0,
minor: 7,
patch: 0,
metadata: null,
patch: 1,
metadata: "development",
toString: function() {
var version = v.format("%{major}.%{minor}.%{patch}", v.version);
if (!v.isEmpty(v.version.metadata)) {
Expand Down Expand Up @@ -13193,6 +13227,12 @@ process.umask = function() { return 0; };
// It can be called even if no validations returned a promise.
async: function(attributes, constraints, options) {
options = v.extend({}, v.async.options, options);

// Removes unknown attributes
if (options.cleanAttributes !== false) {
attributes = v.cleanAttributes(attributes, constraints);
}

var results = v.runValidations(attributes, constraints, options);

return new v.Promise(function(resolve, reject) {
Expand Down Expand Up @@ -13288,6 +13328,11 @@ process.umask = function() { return 0; };
return obj === Object(obj);
},

// Simply checks if the object is an instance of a date
isDate: function(obj) {
return obj instanceof Date;
},

// Returns false if the object is `null` of `undefined`
isDefined: function(obj) {
return obj !== null && obj !== undefined;
Expand Down Expand Up @@ -13348,6 +13393,11 @@ process.umask = function() { return 0; };
return value.length === 0;
}

// Dates have no attributes but aren't empty
if (v.isDate(value)) {
return false;
}

// If we find at least one property we consider it non empty
if (v.isObject(value)) {
for (attr in value) {
Expand Down Expand Up @@ -13439,8 +13489,8 @@ process.umask = function() { return 0; };
return value in obj;
},

getDeepObjectValue: function(obj, keypath) {
if (!v.isObject(obj) || !v.isString(keypath)) {
forEachKeyInKeypath: function(object, keypath, callback) {
if (!v.isString(keypath)) {
return undefined;
}

Expand All @@ -13454,11 +13504,9 @@ process.umask = function() { return 0; };
if (escape) {
escape = false;
key += '.';
} else if (key in obj) {
obj = obj[key];
key = "";
} else {
return undefined;
object = callback(object, key, false);
key = "";
}
break;

Expand All @@ -13478,11 +13526,19 @@ process.umask = function() { return 0; };
}
}

if (v.isDefined(obj) && key in obj) {
return obj[key];
} else {
return callback(object, key, true);
},

getDeepObjectValue: function(obj, keypath) {
if (!v.isObject(obj)) {
return undefined;
}

return v.forEachKeyInKeypath(obj, keypath, function(obj, key) {
if (v.isObject(obj)) {
return obj[key];
}
});
},

// This returns an object with all the values of the form.
Expand Down Expand Up @@ -13634,6 +13690,56 @@ process.umask = function() { return 0; };
return errors.map(function(error) { return error.error; });
},

cleanAttributes: function(attributes, whitelist) {
function whitelistCreator(obj, key, last) {
if (v.isObject(obj[key])) {
return obj[key];
}
return (obj[key] = last ? true : {});
}

function buildObjectWhitelist(whitelist) {
var ow = {}
, lastObject
, attr;
for (attr in whitelist) {
if (!whitelist[attr]) {
continue;
}
v.forEachKeyInKeypath(ow, attr, whitelistCreator);
}
return ow;
}

function cleanRecursive(attributes, whitelist) {
if (!v.isObject(attributes)) {
return attributes;
}

var ret = v.extend({}, attributes)
, w
, attribute;

for (attribute in attributes) {
w = whitelist[attribute];

if (v.isObject(w)) {
ret[attribute] = cleanRecursive(ret[attribute], w);
} else if (!w) {
delete ret[attribute];
}
}
return ret;
}

if (!v.isObject(whitelist) || !v.isObject(attributes)) {
return {};
}

whitelist = buildObjectWhitelist(whitelist);
return cleanRecursive(attributes, whitelist);
},

exposeModule: function(validate, root, exports, module, define) {
if (exports) {
if (module && module.exports) {
Expand Down
Loading

0 comments on commit 498e198

Please sign in to comment.