Skip to content

Commit 02520b7

Browse files
committed
namespace rjs + don't use almond(no remote support) + working index
1 parent 2e4be2a commit 02520b7

File tree

8 files changed

+32
-16
lines changed

8 files changed

+32
-16
lines changed

Gruntfile.js

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,19 +48,20 @@ module.exports = function(grunt) {
4848
compile: {
4949
options: {
5050
baseUrl: "src",
51-
out: 'dist/<%= bower.name %>-<%= bower.version %>.js',
51+
out: 'dist/<%= bower.name %>.js',
5252
paths: {
53-
almond: '../bower_components/almond/almond',
53+
almond: 'lib/almond/almond',
54+
requirejs: 'lib/requirejs/require',
5455
domReady: 'lib/requirejs-domready/domReady',
5556
},
56-
include: ['almond', 'index'],
57+
include: ['requirejs', 'sqwidget'],
5758
// Wrapper for AMD
5859
wrap: {
5960
startFile: 'src/_wrapper/top.js',
6061
endFile: 'src/_wrapper/bottom.js'
6162
},
62-
optimize: 'uglify2',
63-
//optimize: 'none',
63+
//optimize: 'uglify2',
64+
optimize: 'none',
6465
preserveLicenseComments: false,
6566
generateSourceMaps: true
6667
}

bower.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
"bean": "~1.0.4",
2828
"mocha": "~1.14.0",
2929
"chai": "~1.8.1",
30-
"requirejs": "~2.1.9"
30+
"requirejs": "~2.1.9",
31+
"almond": "~0.2.6"
3132
}
3233
}

index.html

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,11 @@ <h2>Publisher Website</h2>
66
<p>The widget script loads from <code>//localhost:8001</code> and all the
77
widgets are loaded from <code>//localhost:8002</code>.</p>
88

9-
<script data-curl-run="sqwidget.js" src="app/lib/curl/dist/curl/curl.js"></script>
10-
<!--<script data-curl-run="sqwidget.js" src="app/lib/curl/dist/debug/curl.js"></script>-->
9+
<script src="dist/sqwidget.js"></script>
1110

12-
<div data-sqwidget="http://localhost:8080/example-widget"
11+
<div data-sqwidget="/test/fixture/example"
1312
data-sqwidget-message="1"
1413
data-sqwidget-background-color="#EEE" data-sqwidget-color="#F00"></div>
1514

16-
<div data-sqwidget="http://localhost:8080/example-widget"
17-
data-sqwidget-message="2"
18-
data-sqwidget-background-color="#FFF" data-sqwidget-color="#F00"></div>
1915
</body>
2016
</html>

src/_wrapper/bottom.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
2+
this.sqwidget = { define: define };
3+
return require(['sqwidget'], function() {});
4+
}));

src/_wrapper/top.js

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
(function (window, factory) {
2+
if (typeof define === 'function' && define.amd) {
3+
// AMD
4+
define(factory);
5+
} else if (typeof exports === 'object') {
6+
// CommonJS
7+
module.exports = factory();
8+
} else {
9+
// Browser globals (mylib is your global library identifier)
10+
window.mylib = factory();
11+
}
12+
}(this, function () {

src/index.js renamed to src/sqwidget.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
define(['require', 'core'], function(require, Core) {
1+
define(['require', './core'], function(require, Core) {
22
var sqwidget = new Core();
33

4-
54
require(['domReady!'], function() {
65
sqwidget.detectSources();
76
sqwidget.initialize();

test/fixture/example.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
define(function() {
1+
sqwidget.define(function() {
22
return {
33
Controller: function (opts) {
44
opts.config.el.append("<div>TEST</div>");

test/test-main.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,8 @@ requirejs.config({
1313
domReady: 'lib/requirejs-domready/domReady'
1414
},
1515
deps: tests,
16-
callback: window.__karma__.start
16+
callback: function() {
17+
window.sqwidget.define = define;
18+
window.__karma__.start();
19+
}
1720
});

0 commit comments

Comments
 (0)