Skip to content

Commit

Permalink
Wrap knockout to support both AMD and global ko.
Browse files Browse the repository at this point in the history
  • Loading branch information
gnab committed Aug 29, 2014
1 parent b38a9fd commit 5640196
Show file tree
Hide file tree
Showing 9 changed files with 5,597 additions and 5,128 deletions.
537 changes: 283 additions & 254 deletions out/editableCell.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion out/editableCell.min.js

Large diffs are not rendered by default.

10,155 changes: 5,292 additions & 4,863 deletions out/tests.js

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions src/ko/editableCellBinding.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
var utils = require('./utils'),
events = require('../events');
events = require('../events'),
ko = require('./wrapper');

var editableCell = {
init: function (element, valueAccessor, allBindings, viewModel, bindingContext) {
Expand Down Expand Up @@ -80,4 +81,4 @@ var editableCell = {
}
};

module.exports = editableCell;
module.exports = editableCell;
5 changes: 3 additions & 2 deletions src/ko/editableCellScrollHostBinding.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
var utils = require('./utils');
var utils = require('./utils'),
ko = require('./wrapper');

var editableCellScrollHost = {
init: function (element) {
Expand All @@ -17,4 +18,4 @@ var editableCellScrollHost = {
}
};

module.exports = editableCellScrollHost;
module.exports = editableCellScrollHost;
7 changes: 4 additions & 3 deletions src/ko/editableCellSelectionBinding.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
var utils = require('./utils');
var utils = require('./utils'),
ko = require('./wrapper');

var editableCellSelection = {
_selectionMappings: [],
Expand Down Expand Up @@ -57,7 +58,7 @@ var editableCellSelection = {

var isDirectUpdate = start.tagName === 'TD' || start.tagName === 'TH';

// Notification of changed selection, either after programmatic
// Notification of changed selection, either after programmatic
// update or after changing current selection in user interface
if (!isDirectUpdate) {
start = start.cell;
Expand All @@ -81,4 +82,4 @@ var editableCellSelection = {
}
};

module.exports = editableCellSelection;
module.exports = editableCellSelection;
3 changes: 2 additions & 1 deletion src/ko/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
var polyfill = require('../polyfill');
var ko = require('./wrapper');

// Knockout binding handlers
var bindingHandlers = {
Expand All @@ -12,4 +13,4 @@ if (typeof ko !== 'undefined') {
for (var bindingHandler in bindingHandlers) {
ko.bindingHandlers[bindingHandler] = bindingHandlers[bindingHandler];
}
}
}
5 changes: 3 additions & 2 deletions src/ko/utils.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
var Selection = require('../selection');
var Selection = require('../selection'),
ko = require('./wrapper');

module.exports = {
initializeSelection: initializeSelection,
Expand Down Expand Up @@ -49,4 +50,4 @@ function cloneNodes (nodesArray, shouldCleanNodes) {
newNodesArray.push(shouldCleanNodes ? ko.cleanNode(clonedNode) : clonedNode);
}
return newNodesArray;
}
}
6 changes: 6 additions & 0 deletions src/ko/wrapper.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
if (typeof ko !== 'undefined') {
module.exports = ko;
}
else {
module.exports = window.require('knockout');
}

0 comments on commit 5640196

Please sign in to comment.