Skip to content

Commit

Permalink
Merging with latest major
Browse files Browse the repository at this point in the history
  • Loading branch information
daffl committed Mar 21, 2016
2 parents e5d947d + 7762f87 commit c19ef50
Show file tree
Hide file tree
Showing 82 changed files with 141 additions and 43,298 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ util/can.*.js
docs*
*.DS_Store
.idea
bower_components/
test/pluginified/latest.js
docco
test/builders/steal-tools/dist/
Expand Down
6 changes: 1 addition & 5 deletions .jshintrc
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"globals": {
"define": true,
"steal": true,
"can": true,
"Zepto": true,
"QUnit": true,
"System": true,
"SimpleDOM": true,
Expand Down Expand Up @@ -41,11 +41,7 @@
"loopfunc": true,
"smarttabs": true,
"maxerr" : 200,
"dojo": true,
"mootools": true,
"yui": true,
"browser": true,
"phantom": true,
"rhino": true,
"node": true
}
1 change: 0 additions & 1 deletion .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ standalone*
docs*
*.DS_Store
.idea
bower_components/
test/pluginified/latest.js
docco
test/
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
sudo: false
language: node_js
node_js: 0.10
before_script: node_modules/.bin/bower install
script: npm test
before_install:
- "npm install -g phantomjs-prebuilt"
- "export DISPLAY=:99.0"
- "sh -e /etc/init.d/xvfb start"
env:
Expand Down
21 changes: 7 additions & 14 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ module.exports = function (grunt) {

options: function (config) {
return {
pluginified: ['2.0.5'],
pluginified: ['3.0.0'],
dist: 'can.' + config
};
}
Expand All @@ -121,7 +121,7 @@ module.exports = function (grunt) {
},
// Removes the dist folder
clean: {
test: ['test/pluginified/latest.js'],
test: ['test/pluginified/latest.js', 'test/dist/'],
build: ['dist/']
},
'string-replace': {
Expand Down Expand Up @@ -160,8 +160,7 @@ module.exports = function (grunt) {
},
lib: [
'component/**/*.js', 'compute/**/*.js', 'construct/**/*.js', 'control/**/*.js', 'list/**/*.js',
'map/**/*.js', 'model/**/*.js', 'observe/**/*.js','route/**/*.js', 'util/**/*.js','view/**/*.js',
'!util/yui/yui-3.7.3.js', '!util/dojo/dojo-1.8.1.js', '!util/dojo/nodelist-traverse.js'
'map/**/*.js', 'model/**/*.js', 'observe/**/*.js','route/**/*.js', 'util/**/*.js','view/**/*.js'
]
},
jsbeautifier: {
Expand All @@ -182,7 +181,7 @@ module.exports = function (grunt) {
src : [
'component/**/*.js', 'compute/**/*.js', 'construct/**/*.js', 'control/**/*.js', 'list/**/*.js',
'map/**/*.js', 'model/**/*.js', 'observe/**/*.js','route/**/*.js', 'util/**/*.js','view/**/*.js',
'!util/dojo/dojo-1.8.1.js', '!util/dojo/nodelist-traverse.js','!**/*_test.js'
'!**/*_test.js'
],
expand : true
}
Expand All @@ -194,7 +193,7 @@ module.exports = function (grunt) {
options : {
jshint : grunt.file.readJSON('.jshintrc'),
title : "CanJS Source",
exclude : /bower_components\|dist\|docs\|guides\|lib\|node_modules\|src\|examples\|dojo\-\|demos/
exclude : /bower_components\|dist\|docs\|guides\|lib\|node_modules\|src\|examples\|demos/
},
files: {
'plato/src': '<%= docco.dev.src %>'
Expand Down Expand Up @@ -251,15 +250,14 @@ module.exports = function (grunt) {
'test/*.html',
'!test/demos_and_tests.html',
'!test/performance-loading.html',
'!test/index.html',
'!test/dojo.html'
'!test/index.html'
],
amd: [ 'test/amd/*.html' ],
dist: [ 'test/dist/*.html' ],
compatibility: [ 'test/compatibility/*.html' ],
dev: [ 'test/dev/*.html' ],
individuals: [ '**/test.html', '!view/autorender/test.html',
'!bower_components/**/test.html', '!node_modules/**/test.html' ]
'!node_modules/**/test.html' ]
}
});
grunt.registerTask('browserify-package', function(){
Expand Down Expand Up @@ -295,11 +293,6 @@ module.exports = function (grunt) {
grunt.registerTask('build:amd',[
'clean:build',
'steal-export:amd',
'steal-export:amd-util-jquery',
'steal-export:amd-util-dojo',
'steal-export:amd-util-yui',
'steal-export:amd-util-zepto',
'steal-export:amd-util-mootools',
'string-replace:version'
]);

Expand Down
41 changes: 0 additions & 41 deletions bower.json

This file was deleted.

18 changes: 1 addition & 17 deletions build/config_meta_defaults.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,15 @@ var reverseNormalize = function(name, load, baseName, baseLoad){
return "jquery";
}

if(name === 'mootools/mootools' || name === 'yui/yui' || name === 'zepto/zepto') {
return name.split('/')[0];
}

if(load.address.indexOf("node_modules") >= 0 ||
load.address.indexOf("bower_components") >= 0 ||
load.address.indexOf("lib/") >= 0) {
return name.replace(/@.*/,"");
}


if(name === "util/library") {
return "can/util/library";
}

if(name === "dojo" || name === "dojo/dojo") {
return "dojo/main";
}

if(name === "can") {
return name;
}
Expand Down Expand Up @@ -77,11 +67,7 @@ module.exports = function(){
minify: true
},
ignorelibs: {
ignore: ["dojo","dojo/dojo","dojo/main",
"jquery","jquery/jquery",
"mootools/mootools","mootools",
"zepto","zepto/zepto",
"yui","yui/yui"].concat([function(moduleName, load){
ignore: ["jquery","jquery/jquery"].concat([function(moduleName, load){
if(load.address.indexOf("node_modules") >= 0) {
return true;
}
Expand All @@ -94,5 +80,3 @@ module.exports = function(){
}
};
};


10 changes: 1 addition & 9 deletions build/config_stealPluginify.js
Original file line number Diff line number Diff line change
Expand Up @@ -251,10 +251,6 @@ module.exports = function(){
}
}
},
"standalone & steal - core & utils - dojo": makeStandaloneAndStealUtil("dojo"),
"standalone & steal - core & utils - yui": makeStandaloneAndStealUtil("yui"),
"standalone & steal - core & utils - zepto": makeStandaloneAndStealUtil("zepto"),
"standalone & steal - core & utils - mootools": makeStandaloneAndStealUtil("mootools"),
"amd": {
system: makeSystemConfig({
main: allModuleNames.concat(["can"]),
Expand All @@ -274,10 +270,6 @@ module.exports = function(){
}
}
},
"amd-util-jquery": makeAmdUtil("jquery"),
"amd-util-dojo": makeAmdUtil("dojo"),
"amd-util-yui": makeAmdUtil("yui"),
"amd-util-zepto": makeAmdUtil("zepto"),
"amd-util-mootools": makeAmdUtil("mootools")
"amd-util-jquery": makeAmdUtil("jquery")
};
};
46 changes: 0 additions & 46 deletions builder.json
Original file line number Diff line number Diff line change
Expand Up @@ -189,52 +189,6 @@

}
}
},
"jquery-2": {
"description": "jQuery (2.x)",
"hidden": true,
"library": "bower_components/jquery/dist/jquery.js",
"steal": {
"paths": {
"jquery/jquery": "bower_components/jquery/dist/jquery.js"
}
}
},
"zepto": {
"description": "Zepto",
"library": "bower_components/zepto/zepto.js",
"steal": {
"map": {
"can/util/util": "can/util/zepto/zepto"
}
}
},
"mootools": {
"description": "Mootools",
"library": "bower_components/mootools/dist/mootools-core.js",
"steal": {
"map": {
"can/util/util": "can/util/mootools/mootools"
}
}
},
"yui": {
"description": "YUI",
"library": "util/yui/yui-3.7.3.js",
"steal": {
"map": {
"can/util/util": "can/util/yui/yui"
}
}
},
"dojo": {
"description": "Dojo",
"library": "util/dojo/dojo-1.8.1.js",
"steal": {
"map": {
"can/util/util": "can/util/dojo/dojo"
}
}
}
}
}
5 changes: 0 additions & 5 deletions component/test.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<title>can/component</title>
<script type="text/javascript" src="../bower_components/modernizr/modernizr.js"></script>
<script src="../node_modules/steal/steal.js" main="can/component/component_test"></script>
<div id="qunit-fixture"></div>

Expand All @@ -12,7 +11,3 @@
<script src="production.js"></script>
</body>
</html>




2 changes: 1 addition & 1 deletion construct/construct.js
Original file line number Diff line number Diff line change
Expand Up @@ -587,7 +587,7 @@ can.extend(can.Construct, {
fullName: fullName,
_fullName: _fullName
});
// Dojo and YUI extend undefined

if (shortName !== undefined) {
Constructor.shortName = shortName;
}
Expand Down
Loading

0 comments on commit c19ef50

Please sign in to comment.