Skip to content

Commit

Permalink
namespace rjs + don't use almond(no remote support) + working index
Browse files Browse the repository at this point in the history
  • Loading branch information
purge committed Nov 11, 2013
1 parent 2e4be2a commit 02520b7
Show file tree
Hide file tree
Showing 8 changed files with 32 additions and 16 deletions.
11 changes: 6 additions & 5 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,19 +48,20 @@ module.exports = function(grunt) {
compile: {
options: {
baseUrl: "src",
out: 'dist/<%= bower.name %>-<%= bower.version %>.js',
out: 'dist/<%= bower.name %>.js',
paths: {
almond: '../bower_components/almond/almond',
almond: 'lib/almond/almond',
requirejs: 'lib/requirejs/require',
domReady: 'lib/requirejs-domready/domReady',
},
include: ['almond', 'index'],
include: ['requirejs', 'sqwidget'],
// Wrapper for AMD
wrap: {
startFile: 'src/_wrapper/top.js',
endFile: 'src/_wrapper/bottom.js'
},
optimize: 'uglify2',
//optimize: 'none',
//optimize: 'uglify2',
optimize: 'none',
preserveLicenseComments: false,
generateSourceMaps: true
}
Expand Down
3 changes: 2 additions & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
"bean": "~1.0.4",
"mocha": "~1.14.0",
"chai": "~1.8.1",
"requirejs": "~2.1.9"
"requirejs": "~2.1.9",
"almond": "~0.2.6"
}
}
8 changes: 2 additions & 6 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,11 @@ <h2>Publisher Website</h2>
<p>The widget script loads from <code>//localhost:8001</code> and all the
widgets are loaded from <code>//localhost:8002</code>.</p>

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

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

<div data-sqwidget="http://localhost:8080/example-widget"
data-sqwidget-message="2"
data-sqwidget-background-color="#FFF" data-sqwidget-color="#F00"></div>
</body>
</html>
4 changes: 4 additions & 0 deletions src/_wrapper/bottom.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@

this.sqwidget = { define: define };
return require(['sqwidget'], function() {});
}));
12 changes: 12 additions & 0 deletions src/_wrapper/top.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
(function (window, factory) {
if (typeof define === 'function' && define.amd) {
// AMD
define(factory);
} else if (typeof exports === 'object') {
// CommonJS
module.exports = factory();
} else {
// Browser globals (mylib is your global library identifier)
window.mylib = factory();
}
}(this, function () {
3 changes: 1 addition & 2 deletions src/index.js → src/sqwidget.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
define(['require', 'core'], function(require, Core) {
define(['require', './core'], function(require, Core) {
var sqwidget = new Core();


require(['domReady!'], function() {
sqwidget.detectSources();
sqwidget.initialize();
Expand Down
2 changes: 1 addition & 1 deletion test/fixture/example.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
define(function() {
sqwidget.define(function() {
return {
Controller: function (opts) {
opts.config.el.append("<div>TEST</div>");
Expand Down
5 changes: 4 additions & 1 deletion test/test-main.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,8 @@ requirejs.config({
domReady: 'lib/requirejs-domready/domReady'
},
deps: tests,
callback: window.__karma__.start
callback: function() {
window.sqwidget.define = define;
window.__karma__.start();
}
});

0 comments on commit 02520b7

Please sign in to comment.