Skip to content

Commit

Permalink
Merge from github/seajs/seajs 2.2.x branch
Browse files Browse the repository at this point in the history
  • Loading branch information
hotoo committed Jan 12, 2015
2 parents e0366b9 + 478b1be commit e8195c2
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 15 deletions.
19 changes: 7 additions & 12 deletions dist/sea-debug.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Sea.js 2.2.2 | seajs.org/LICENSE.md
* Sea.js 2.2.3 | seajs.org/LICENSE.md
*/
(function(global, undefined) {

Expand All @@ -10,7 +10,7 @@ if (global.seajs) {

var seajs = global.seajs = {
// The current version of Sea.js being used
version: "2.2.2"
version: "2.2.3"
}

var data = seajs.data = {}
Expand All @@ -30,13 +30,13 @@ var isObject = isType("Object")
var isString = isType("String")
var isArray = Array.isArray || isType("Array")
var isFunction = isType("Function")
var isUndefined = isType("Undefined")

var _cid = 0
function cid() {
return _cid++
}


/**
* util-events.js - The minimal events support
*/
Expand Down Expand Up @@ -298,16 +298,12 @@ function request(url, callback, charset, crossorigin) {
var node = doc.createElement(isCSS ? "link" : "script")

if (charset) {
var cs = isFunction(charset) ? charset(url) : charset
if (cs) {
node.charset = cs
}
node.charset = charset
}

// crossorigin default value is `false`.
var cors = isFunction(crossorigin) ? crossorigin(url) : crossorigin
if (cors !== false) {
node.crossorigin = cors
if (!isUndefined(crossorigin)) {
node.setAttribute("crossorigin", crossorigin)
}


Expand Down Expand Up @@ -443,7 +439,6 @@ function getCurrentScript() {
// For Developers
seajs.request = request


/**
* util-deps.js - The parser for dependencies
* ref: tests/research/parse-dependencies/test.html
Expand Down Expand Up @@ -892,7 +887,7 @@ data.cwd = cwd
data.charset = "utf-8"

// The CORS options, Do't set CORS on default.
data.crossorigin = false
//data.crossorigin = undefined

// Modules that are needed to load before all other modules
data.preload = (function() {
Expand Down
4 changes: 2 additions & 2 deletions dist/sea.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"family": "seajs",
"name": "seajs",
"version": "2.2.2",
"version": "2.2.3",
"description": "A Module Loader for the Web",
"homepage": "http://seajs.org/",
"keywords": ["module", "loader"],
Expand Down

0 comments on commit e8195c2

Please sign in to comment.