Skip to content

Commit c24f88e

Browse files
killme2008killme2008
committed
Fixed conflicts.
2 parents 5b8b208 + abb166e commit c24f88e

Some content is hidden

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

58 files changed

+8889
-8792
lines changed

‎dist/av-core-mini.js‎

Lines changed: 4 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/av-core.js‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1244,25 +1244,31 @@
12441244
*/
12451245
var AV = root.AV;
12461246

1247+
// Import XMLHttpRequest
1248+
if (typeof(XMLHttpRequest) !== 'undefined') {
1249+
AV.XMLHttpRequest = XMLHttpRequest;
1250+
} else if (typeof(require) === 'function' && typeof(require.ensure) === 'undefined') {
1251+
AV.XMLHttpRequest = require('xmlhttprequest').XMLHttpRequest;
1252+
}
1253+
1254+
// Import localStorage
1255+
if (typeof(localStorage) !== 'undefined') {
1256+
AV.localStorage= localStorage;
1257+
} else if (typeof(require) === 'function' && typeof(require.ensure) === 'undefined') {
1258+
try{
1259+
AV.localStorage = require('localStorage');
1260+
}catch(error){
1261+
AV.localStorage = require('./localStorage.js').localStorage;
1262+
}
1263+
}
1264+
12471265
// Import AV's local copy of underscore.
12481266
if (typeof(exports) !== "undefined" && exports._) {
12491267
// We're running in Node.js. Pull in the dependencies.
12501268
AV._ = exports._.noConflict();
1251-
try{
1252-
AV.localStorage = require('localStorage');
1253-
}catch(error){
1254-
AV.localStorage = require('./localStorage.js').localStorage;
1255-
}
1256-
AV.XMLHttpRequest = require('xmlhttprequest').XMLHttpRequest;
12571269
exports.AV = AV;
12581270
} else {
12591271
AV._ = _.noConflict();
1260-
if (typeof(localStorage) !== "undefined") {
1261-
AV.localStorage = localStorage;
1262-
}
1263-
if (typeof(XMLHttpRequest) !== "undefined") {
1264-
AV.XMLHttpRequest = XMLHttpRequest;
1265-
}
12661272
}
12671273

12681274
// If jQuery or Zepto has been included, grab a reference to it.

‎dist/av-mini.js‎

Lines changed: 5 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/av.js‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1244,25 +1244,31 @@
12441244
*/
12451245
var AV = root.AV;
12461246

1247+
// Import XMLHttpRequest
1248+
if (typeof(XMLHttpRequest) !== 'undefined') {
1249+
AV.XMLHttpRequest = XMLHttpRequest;
1250+
} else if (typeof(require) === 'function' && typeof(require.ensure) === 'undefined') {
1251+
AV.XMLHttpRequest = require('xmlhttprequest').XMLHttpRequest;
1252+
}
1253+
1254+
// Import localStorage
1255+
if (typeof(localStorage) !== 'undefined') {
1256+
AV.localStorage= localStorage;
1257+
} else if (typeof(require) === 'function' && typeof(require.ensure) === 'undefined') {
1258+
try{
1259+
AV.localStorage = require('localStorage');
1260+
}catch(error){
1261+
AV.localStorage = require('./localStorage.js').localStorage;
1262+
}
1263+
}
1264+
12471265
// Import AV's local copy of underscore.
12481266
if (typeof(exports) !== "undefined" && exports._) {
12491267
// We're running in Node.js. Pull in the dependencies.
12501268
AV._ = exports._.noConflict();
1251-
try{
1252-
AV.localStorage = require('localStorage');
1253-
}catch(error){
1254-
AV.localStorage = require('./localStorage.js').localStorage;
1255-
}
1256-
AV.XMLHttpRequest = require('xmlhttprequest').XMLHttpRequest;
12571269
exports.AV = AV;
12581270
} else {
12591271
AV._ = _.noConflict();
1260-
if (typeof(localStorage) !== "undefined") {
1261-
AV.localStorage = localStorage;
1262-
}
1263-
if (typeof(XMLHttpRequest) !== "undefined") {
1264-
AV.XMLHttpRequest = XMLHttpRequest;
1265-
}
12661272
}
12671273

12681274
// If jQuery or Zepto has been included, grab a reference to it.

‎dist/avos-javascript-sdk-0.5.1.tar.gz‎

115 Bytes
Binary file not shown.

‎dist/js-sdk-api-docs-0.5.1.tar.gz‎

26 Bytes
Binary file not shown.

‎dist/js-sdk-api-docs/files.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ <h2><a href="symbols/src/lib_cloud.js.html">lib/cloud.js</a></h2>
304304
</div>
305305
<div class="fineprint" style="clear:both">
306306

307-
Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blankt">JsDoc Toolkit</a> 2.4.0 on Fri Mar 27 2015 15:29:52 GMT+0800 (CST)
307+
Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blankt">JsDoc Toolkit</a> 2.4.0 on Fri Apr 24 2015 18:57:59 GMT+0800 (CST)
308308
</div>
309309
</body>
310310
</html>

‎dist/js-sdk-api-docs/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,7 @@ <h2><a href="symbols/avosExpressHttpsRedirect.html">avosExpressHttpsRedirect</a>
553553

554554
</div>
555555
<div class="fineprint" style="clear:both">
556-
Documentation generated by <a href="https://leancloud.cn" target="_blankt">LeanCloud.cn</a> 2.4.0 on Fri Mar 27 2015 15:29:52 GMT+0800 (CST)
556+
Documentation generated by <a href="https://leancloud.cn" target="_blankt">LeanCloud.cn</a> 2.4.0 on Fri Apr 24 2015 18:57:59 GMT+0800 (CST)
557557
</div>
558558
</body>
559559
</html>

‎dist/js-sdk-api-docs/symbols/AV.ACL.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1104,7 +1104,7 @@ <h1 class="classTitle">
11041104
<!-- ============================== footer ================================= -->
11051105
<div class="fineprint" style="clear:both">
11061106

1107-
Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Fri Mar 27 2015 15:29:50 GMT+0800 (CST)
1107+
Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Fri Apr 24 2015 18:57:57 GMT+0800 (CST)
11081108
</div>
11091109
</body>
11101110
</html>

‎dist/js-sdk-api-docs/symbols/AV.Cloud.AfterSaveRequest.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,7 @@ <h1 class="classTitle">
463463
<!-- ============================== footer ================================= -->
464464
<div class="fineprint" style="clear:both">
465465

466-
Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Fri Mar 27 2015 15:29:50 GMT+0800 (CST)
466+
Documentation generated by <a href="http://code.google.com/p/jsdoc-toolkit/" target="_blank">JsDoc Toolkit</a> 2.4.0 on Fri Apr 24 2015 18:57:57 GMT+0800 (CST)
467467
</div>
468468
</body>
469469
</html>

0 commit comments

Comments
 (0)