Skip to content
This repository was archived by the owner on Apr 11, 2023. It is now read-only.

Commit bd4ea5c

Browse files
lazarvlazarv
committed
Merge and resolve conflict
2 parents fafd221 + 86ffd1b commit bd4ea5c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+320
-295
lines changed

‎build/config.json‎

Lines changed: 105 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,113 @@
8989
"taskName": "jaydataproviders",
9090
"dependencies": ["odataprovider", "sqliteprovider", "inmemoryprovider", "yqlprovider", "indexeddbprovider", "webapiprovider", "facebookprovider"]
9191
},
92+
{
93+
"taskName": "angularmodule",
94+
"browserify": { "standalone": "$data" },
95+
"require": ["./src/JayDataModules/angular.js", { "entry": true }],
96+
"external": ["jaydata/core"],
97+
"destFile": "angular.js",
98+
"destFolder": "./dist/public/jaydatamodules"
99+
},
100+
{
101+
"taskName": "errorhandlermodule",
102+
"browserify": { "standalone": "$data" },
103+
"require": ["./src/JayDataModules/errorhandler.js", { "entry": true }],
104+
"external": ["jaydata/core"],
105+
"destFile": "errorhandler.js",
106+
"destFolder": "./dist/public/jaydatamodules"
107+
},
108+
{
109+
"taskName": "formbindermodule",
110+
"browserify": { "standalone": "$data" },
111+
"require": ["./src/JayDataModules/formBinder.js", { "entry": true }],
112+
"external": ["jaydata/core"],
113+
"destFile": "formBinder.js",
114+
"destFolder": "./dist/public/jaydatamodules"
115+
},
116+
{
117+
"taskName": "handlebarsmodule",
118+
"browserify": { "standalone": "$data" },
119+
"require": ["./src/JayDataModules/handlebars.js", { "entry": true }],
120+
"external": ["jaydata/core"],
121+
"destFile": "handlebars.js",
122+
"destFolder": "./dist/public/jaydatamodules"
123+
},
124+
{
125+
"taskName": "inmemorymodule",
126+
"browserify": { "standalone": "$data" },
127+
"require": ["./src/JayDataModules/inMemory.js", { "entry": true }],
128+
"external": ["jaydata/core"],
129+
"destFile": "inMemory.js",
130+
"destFolder": "./dist/public/jaydatamodules"
131+
},
132+
{
133+
"taskName": "mscrmclientmodule",
134+
"browserify": { "standalone": "$data" },
135+
"require": ["./src/JayDataModules/jaydata.mscrm.js", { "entry": true }],
136+
"external": ["jaydata/core"],
137+
"destFile": "jaydata.mscrm.js",
138+
"destFolder": "./dist/public/jaydatamodules"
139+
},
140+
141+
142+
{
143+
"taskName": "kendomodule",
144+
"browserify": { "standalone": "$data" },
145+
"require": ["./src/JayDataModules/kendo.js", { "entry": true }],
146+
"external": ["jaydata/core"],
147+
"destFile": "kendo.js",
148+
"destFolder": "./dist/public/jaydatamodules"
149+
},
150+
{
151+
"taskName": "knockoutmodule",
152+
"browserify": { "standalone": "$data" },
153+
"require": ["./src/JayDataModules/knockout.js", { "entry": true }],
154+
"external": ["jaydata/core"],
155+
"destFile": "knockout.js",
156+
"destFolder": "./dist/public/jaydatamodules"
157+
},
158+
{
159+
"taskName": "qdeferredmodule",
160+
"browserify": { "standalone": "$data" },
161+
"require": ["./src/JayDataModules/qDeferred.js", { "entry": true }],
162+
"external": ["jaydata/core", "q"],
163+
"destFile": "qDeferred.js",
164+
"destFolder": "./dist/public/jaydatamodules"
165+
},
166+
{
167+
"taskName": "senchamodule",
168+
"browserify": { "standalone": "$data" },
169+
"require": ["./src/JayDataModules/sencha.js", { "entry": true }],
170+
"external": ["jaydata/core"],
171+
"destFile": "sencha.js",
172+
"destFolder": "./dist/public/jaydatamodules"
173+
},
174+
{
175+
"taskName": "templatemodule",
176+
"browserify": { "standalone": "$data" },
177+
"require": ["./src/JayDataModules/template.js", { "entry": true }],
178+
"external": ["jaydata/core"],
179+
"destFile": "template.js",
180+
"destFolder": "./dist/public/jaydatamodules"
181+
},
182+
{
183+
"taskName": "validatemodule",
184+
"browserify": { "standalone": "$data" },
185+
"require": ["./src/JayDataModules/validate.js", { "entry": true }],
186+
"external": ["jaydata/core"],
187+
"destFile": "validate.js",
188+
"destFolder": "./dist/public/jaydatamodules"
189+
},
190+
{
191+
"taskName": "jaydatamodules",
192+
"dependencies": ["angularmodule", "errorhandlermodule", "formbindermodule",
193+
"handlebarsmodule", "inmemorymodule", "mscrmclientmodule", "kendomodule", "knockoutmodule",
194+
"qdeferredmodule", "senchamodule", "templatemodule", "validatemodule"]
195+
},
92196
{
93197
"taskName": "bundle",
94-
"dependencies": ["jaydata", "jaydataproviders"]
198+
"dependencies": ["jaydata", "jaydataproviders", "jaydatamodules"]
95199
},
96200
{
97201
"taskName": "all",

‎package.json‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@
7777
"babelify": "^6.3.0",
7878
"browserify": "^11.2.0",
7979
"browserify-derequire": "^0.9.4",
80+
"browserify-shim": "^3.8.11",
8081
"google-closure-compiler": "^20151015.0.0",
8182
"gulp": "^3.8.11",
8283
"gulp-babel": "^5.2.1",
@@ -105,5 +106,18 @@
105106
"minimist": "^1.1.1",
106107
"vinyl-buffer": "^1.0.0",
107108
"vinyl-source-stream": "^1.1.0"
109+
},
110+
"browserify": {
111+
"transform": [ "browserify-shim" ]
112+
},
113+
"browserify-shim": {
114+
"jQuery": "global:jQuery",
115+
"odatajs": "global:odatajs",
116+
"angular": "global:angular",
117+
"Handlebars": "global:Handlebars",
118+
"kendo": "global:kendo",
119+
"ko": "global:ko",
120+
"q": "global:Q",
121+
"Ext": "global:Ext"
108122
}
109123
}

‎src/JayDataModules/angular.js‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1+
import $data, { $C, Guard, Container, Exception, MemberDefinition } from 'jaydata/core';
2+
import jQuery from 'jQuery';
3+
import angular from 'angular';
4+
15
(function() {
2-
6+
37
Object.defineProperty($data.Entity.prototype, "_isNew", {
48
get: function () {
59
return !this.storeToken;
@@ -48,7 +52,7 @@ angular.module('jaydata', ['ng', ['$provide', function ($provide) {
4852
$data.Queryable.prototype.toLiveArrayEx = function (options, resultHolder) {
4953
if (Array.isArray(options)) {
5054
resultHolder = options;
51-
otions = undefined;
55+
options = undefined;
5256
}
5357
resultHolder = resultHolder || [];
5458
options = options || {};
@@ -70,7 +74,7 @@ angular.module('jaydata', ['ng', ['$provide', function ($provide) {
7074
}
7175

7276
function refresh() {
73-
var defer = $.Deferred(thunk);
77+
var defer = jQuery.Deferred(thunk);
7478
defer.promise(resultHolder);
7579
return resultHolder;
7680
}
@@ -97,7 +101,7 @@ angular.module('jaydata', ['ng', ['$provide', function ($provide) {
97101
result.successHandlers = [];
98102
result.errorHandlers = [];
99103

100-
104+
101105
if (cb && typeof cb === 'function') {
102106
chainOrFire(cb, "success");
103107
}
@@ -248,7 +252,7 @@ angular.module('jaydata', ['ng', ['$provide', function ($provide) {
248252
d.reject(err);
249253
if (!$rootScope.$$phase) $rootScope.$apply();
250254
});
251-
255+
252256
return d.promise;
253257
}
254258

@@ -270,3 +274,5 @@ angular.module('jaydata', ['ng', ['$provide', function ($provide) {
270274
}]]);
271275

272276
})();
277+
278+
export default $data

‎src/JayDataModules/deferred.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
import $data, { $C, Guard, Container, Exception } from '../TypeSystem/index.js';
2+
var jQuery = $data.__global['jQuery'];
23

34
(function ($data) {
45
if (typeof jQuery !== 'undefined') {
56
$data.Class.define('$data.Deferred', $data.PromiseHandlerBase, null, {
67
constructor: function () {
7-
this.deferred = new $.Deferred();
8+
this.deferred = new jQuery.Deferred();
89
},
910
deferred: {},
1011
createCallback: function (callBack) {

‎src/JayDataModules/errorhandler.js‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1+
import $data, { $C, Guard, Container, Exception, MemberDefinition } from 'jaydata/core';
2+
13
(function(){
2-
window.onerror = function(msg, url, line){
4+
$data.__global.onerror = function(msg, url, line){
35
alert('Error' + (line ? ' in line ' + line : '') + '\n' + (url || '') + '\n' + msg);
46
};
57

6-
/*window.onerror = function(msg, url, line){
8+
/*$data.__global.onerror = function(msg, url, line){
79
var html = '<div class="error"><span class="url">{url}</span><p class="msg">{msg}</p><span class="line">{line}</span></div>';
810
html = html.replace('{url}', url || '');
911
html = html.replace('{msg}', msg || '');
@@ -16,7 +18,9 @@
1618
container.className = 'jaydata-errorhandler';
1719
document.body.appendChild(container);
1820
}
19-
21+
2022
container.innerHTML += html;
2123
};*/
22-
})();
24+
})();
25+
26+
export default $data

‎src/JayDataModules/formBinder.js‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
import $data, { $C, Guard, Container, Exception, MemberDefinition } from 'jaydata/core';
2+
import jQuery from 'jQuery'
3+
14
/* Base: http://bitovi.com/blog/2010/06/convert-form-elements-to-javascript-object-literals-with-jquery-formBinder-plugin.html */
25
(function ($) {
36
var radioCheck = /radio|checkbox/i,
@@ -105,4 +108,6 @@
105108
return data;
106109
}
107110
});
108-
})(jQuery);
111+
})(jQuery);
112+
113+
export default $data

‎src/JayDataModules/handlebars.js‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
1-
(function ($data, Handlebars) {
1+
import $data, { $C, Guard, Container, Exception, MemberDefinition } from 'jaydata/core';
2+
import jQuery from 'jQuery';
3+
import Handlebars from 'Handlebars'
4+
5+
(function ($data, Handlebars, $) {
26
var oldProcessor = $data.Entity.inheritedTypeProcessor;
37
var templateCache = {};
48

5-
9+
610

711

812
function getTemplate(templateName) {
@@ -43,13 +47,13 @@
4347
return $('#' + templateName).html();
4448
}
4549

46-
50+
4751
var templateEngine = {
4852
templateResolvers: [htmlTemplateResolver, typeTemplateResolver, globalTemplateNameResolver],
4953
templateCompiler: handleBarTemplateCompiler,
5054
templateCache: { },
5155
getTemplate: function (type, templateName) {
52-
var template, incache;
56+
var template, incache, i;
5357
var cacheKey = type.fullName + "::" + templateName;
5458
incache = template = this.templateCache[cacheKey], i = 0;
5559
while (!template && i < this.templateResolvers.length) {
@@ -60,11 +64,11 @@
6064
}
6165
if (!template) {
6266
console.log("Can not find template: " + templateName);
63-
}
67+
}
6468
return template;
6569
}
6670
};
67-
71+
6872
$data.templateEngine = templateEngine;
6973

7074
$data.render = function (data, templateName) {
@@ -118,7 +122,7 @@
118122
$(selector).before(result);
119123
break;
120124
}
121-
125+
122126
return data;
123127
}
124128
}
@@ -159,7 +163,7 @@
159163
oldProcessor(type);
160164
}
161165

162-
166+
163167
function render(item, templateName) {
164168
var template = templateEngine.getTemplate(type, templateName);
165169
if (! (item instanceof $data.Entity)) {
@@ -201,7 +205,7 @@
201205

202206
type.renderTo = function (item, selector, templateName, renderMode) {
203207
if (typeof item !== 'object') {
204-
replaceMode = templateName;
208+
renderMode = templateName;
205209
templateName = selector;
206210
selector = item;
207211
return type.readAll().then($data.renderTo(selector, templateName, renderMode));
@@ -211,7 +215,7 @@
211215

212216
type.renderItemsTo = function (items, selector, templateName, renderMode) {
213217
if (!(Array.isArray(items))) {
214-
replaceMode = templateName;
218+
renderMode = templateName;
215219
templateName = selector;
216220
selector = items;
217221
return type.readAll().then($data.renderItemsTo(selector, templateName, renderMode));
@@ -306,7 +310,7 @@
306310
var name = sname[sname.length - 1];
307311
var key = this.getType().memberDefinitions.getKeyProperties()[0];
308312
var id = this[key.name];
309-
313+
310314
var result = "data-" + name.toLowerCase() + "-" + id;
311315
var cacheInfo = addToCache(this);
312316
result += " data-cache-client=" + cacheInfo.clientId;
@@ -351,4 +355,6 @@
351355
$(this).children().removeClass("active");
352356
result.addClass("active");
353357
});
354-
})($data, Handlebars);
358+
})($data, Handlebars, jQuery);
359+
360+
export default $data

‎src/JayDataModules/inMemory.js‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import $data, { $C, Guard, Container, Exception, MemberDefinition } from 'jaydata/core';
2+
13
(function ($data) {
24

35
$data.Array.prototype.toQueryable = function () {
@@ -29,4 +31,6 @@
2931
return context.Source;
3032
}
3133

32-
})($data);
34+
})($data);
35+
36+
export default $data

0 commit comments

Comments
 (0)