Skip to content

Relocate declaration of some funcs for strict mode #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 18, 2016
Merged

Relocate declaration of some funcs for strict mode #63

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
222 changes: 112 additions & 110 deletions src/igniteui-angular.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,103 @@
$.ig.angular.igCombo.element = $.ig.angular.igCombo.element || "<input></input>";
$.ig.angular.igCombo.events = [ "igcombotextchanged", "igcomboselectionchanged" ];

// Mark watchers for discoverability
function markWatcher(scope, controlName, attrs) {
// Angular uses unshift(), so the last watcher is at 0:
scope.$$watchers[ 0 ][ controlName ] = attrs.id || controlName + scope.$$watchers.length;
}

// Interrogation functions
function isDate(value) {
return Object.prototype.toString.call(value) === "[object Date]";
}

function isRegExp(value) {
return Object.prototype.toString.call(value) === "[object RegExp]";
}

function isScope(obj) {
return obj && obj.$evalAsync && obj.$watch;
}

function isWindow(obj) {
return obj && obj.document && obj.location && obj.alert && obj.setInterval;
}

function isFunction(value) { return typeof value === "function"; }

function isArray(value) {
return Object.prototype.toString.call(value) === "[object Array]";
}

function equalsDiff(o1, o2, diff) {
if (o1 === o2) { return true; }
if (o1 === null || o2 === null) { return false; }
if (o1 !== o1 && o2 !== o2) { return true; }// NaN === NaN
var t1 = typeof o1, t2 = typeof o2, length, key, keySet,
dirty, skipDiff = false, changedVals = [];
if (t1 === t2) {
if (t1 === "object") {
if (isArray(o1)) {
if (!isArray(o2)) { return false; }
if ((length = o1.length) === o2.length) {
if (!isArray(diff)) {
skipDiff = true;
}
for (key = 0; key < length; key++) {
// we are comparing objects here
if (!equalsDiff(o1[ key ], o2[ key ], changedVals)) {
dirty = true;
if (!skipDiff) {
diff.push({ index: key, txlog: changedVals });
}
}
}
if (dirty) {
return false;
}
return true;
}
} else if (isDate(o1)) {
return isDate(o2) && o1.getTime() === o2.getTime();
} else if (isRegExp(o1) && isRegExp(o2)) {
return o1.toString() === o2.toString();
} else {
if (isScope(o1) || isScope(o2) ||
isWindow(o1) || isWindow(o2) ||
isArray(o2)) {
return false;
}
keySet = {};
if (!isArray(diff)) {
skipDiff = true;
}
for (key in o1) {
if (key.charAt(0) === "$" || isFunction(o1[ key ])) { continue; }
if (!equalsDiff(o1[ key ], o2[ key ])) {
dirty = true;
if (!skipDiff) {
diff.push({ key: key, oldVal: o2[ key ], newVal: o1[ key ] });
}
}
keySet[ key ] = true;
}
for (key in o2) {
if (!keySet.hasOwnProperty(key) &&
key.charAt(0) !== "$" &&
o2[ key ] !== undefined &&
!isFunction(o2[ key ])) { return false; }
}
if (dirty) {
return false;
}
return true;
}
}
}
return false;
}

// Two way data binding for the combo control
$.ig.angular.igCombo.bindEvents = $.ig.angular.igCombo.bindEvents ||
function (scope, element, attrs, model) {
Expand Down Expand Up @@ -157,20 +254,8 @@
function (scope, element, attrs) {
var unbinder,
collectionWatchMode = attrs && attrs.collectionWatch && attrs.collectionWatch === "true";
element.on($.ig.angular.igGrid.events.join(" "), function () {
unbinder();
/* When in collection watch mode, a change is detected only when the collection changes - a element is inserted or removed or the whole collection reference changes.
Changes in a specific element inside collection are not detected. This provides huge performance boost when such change detection is not required */
unbinder = collectionWatchMode ?
scope.$watchCollection(attrs.source, watchGridDataSource) :
scope.$watch(attrs.source, watchGridDataSource, true);
scope.$apply();
markWatcher(scope, "igGrid", attrs);
}).one("$destroy", function () {
unbinder();
});

function watchGridDataSource(newValue, oldValue) {
function watchGridDataSource(newValue, oldValue) {
var i, j, existingDomRow, existingRow,
grid = element.data("igGrid"), pkKey = grid.options.primaryKey,
gridUpdating = element.data("igGridUpdating"), column,
Expand Down Expand Up @@ -256,6 +341,20 @@
}
}
}

element.on($.ig.angular.igGrid.events.join(" "), function () {
unbinder();
/* When in collection watch mode, a change is detected only when the collection changes - a element is inserted or removed or the whole collection reference changes.
Changes in a specific element inside collection are not detected. This provides huge performance boost when such change detection is not required */
unbinder = collectionWatchMode ?
scope.$watchCollection(attrs.source, watchGridDataSource) :
scope.$watch(attrs.source, watchGridDataSource, true);
scope.$apply();
markWatcher(scope, "igGrid", attrs);
}).one("$destroy", function () {
unbinder();
});

/* watch for changes from the data source to the view */
unbinder = collectionWatchMode ?
scope.$watchCollection(attrs.source, watchGridDataSource) :
Expand Down Expand Up @@ -380,12 +479,6 @@
});
};

// Mark watchers for discoverability
function markWatcher(scope, controlName, attrs) {
// Angular uses unshift(), so the last watcher is at 0:
scope.$$watchers[ 0 ][ controlName ] = attrs.id || controlName + scope.$$watchers.length;
}

// Utility functions
function convertToCamelCase(str) {
//convert hyphen to camelCase
Expand Down Expand Up @@ -500,97 +593,6 @@
return options;
}

function equalsDiff(o1, o2, diff) {
if (o1 === o2) { return true; }
if (o1 === null || o2 === null) { return false; }
if (o1 !== o1 && o2 !== o2) { return true; }// NaN === NaN
var t1 = typeof o1, t2 = typeof o2, length, key, keySet,
dirty, skipDiff = false, changedVals = [];
if (t1 === t2) {
if (t1 === "object") {
if (isArray(o1)) {
if (!isArray(o2)) { return false; }
if ((length = o1.length) === o2.length) {
if (!isArray(diff)) {
skipDiff = true;
}
for (key = 0; key < length; key++) {
// we are comparing objects here
if (!equalsDiff(o1[ key ], o2[ key ], changedVals)) {
dirty = true;
if (!skipDiff) {
diff.push({ index: key, txlog: changedVals });
}
}
}
if (dirty) {
return false;
}
return true;
}
} else if (isDate(o1)) {
return isDate(o2) && o1.getTime() === o2.getTime();
} else if (isRegExp(o1) && isRegExp(o2)) {
return o1.toString() === o2.toString();
} else {
if (isScope(o1) || isScope(o2) ||
isWindow(o1) || isWindow(o2) ||
isArray(o2)) {
return false;
}
keySet = {};
if (!isArray(diff)) {
skipDiff = true;
}
for (key in o1) {
if (key.charAt(0) === "$" || isFunction(o1[ key ])) { continue; }
if (!equalsDiff(o1[ key ], o2[ key ])) {
dirty = true;
if (!skipDiff) {
diff.push({ key: key, oldVal: o2[ key ], newVal: o1[ key ] });
}
}
keySet[ key ] = true;
}
for (key in o2) {
if (!keySet.hasOwnProperty(key) &&
key.charAt(0) !== "$" &&
o2[ key ] !== undefined &&
!isFunction(o2[ key ])) { return false; }
}
if (dirty) {
return false;
}
return true;
}
}
}
return false;
}

// Interrogation functions
function isDate(value) {
return Object.prototype.toString.call(value) === "[object Date]";
}

function isRegExp(value) {
return Object.prototype.toString.call(value) === "[object RegExp]";
}

function isScope(obj) {
return obj && obj.$evalAsync && obj.$watch;
}

function isWindow(obj) {
return obj && obj.document && obj.location && obj.alert && obj.setInterval;
}

function isFunction(value) { return typeof value === "function"; }

function isArray(value) {
return Object.prototype.toString.call(value) === "[object Array]";
}

function getHtml(selector) {
return $(selector).html();
}
Expand Down