From 4225af48723cea1f7027f94211c05e45ba4d1950 Mon Sep 17 00:00:00 2001 From: Dav Hill Date: Wed, 23 Mar 2016 19:21:58 +0000 Subject: [PATCH 1/2] Add a filename to the define call in the module header Fixes amd warnings: `Error: A module must not have more than one anonymous 'define' calls.` when adding dependency of `dist/wysihtml-toolbar` with r.js --- builder/build.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/builder/build.js b/builder/build.js index a96e6737..4916482e 100644 --- a/builder/build.js +++ b/builder/build.js @@ -157,7 +157,8 @@ function assembleCoreScript() { function copyModuleScripts() { modules.forEach(function(moduleFile) { - var moduleCode = fs.readFileSync(srcDir + "modules/" + moduleFile, FILE_ENCODING); + var moduleCode = fs.readFileSync(srcDir + "modules/" + moduleFile, FILE_ENCODING), + filename = path.basename(moduleFile, path.extname(moduleFile)); // Run build directives moduleCode = moduleCode.replace(/\/\*\s?build:modularizeWithRangyDependency\s?\*\/([\s\S]*?)\/\*\s?build:modularizeEnd\s?\*\//gm, function(match, code) { @@ -165,8 +166,8 @@ function copyModuleScripts() { return [ '(function(factory, root) {', ' if (typeof define == "function" && define.amd) {', - ' // AMD. Register as an anonymous module with a dependency on Rangy.', - ' define(["./rangy-core"], factory);', + ' // AMD. Register as a module with a dependency on Rangy.', + ' define("' + filename + '", ["./rangy-core"], factory);', ' } else if (typeof module != "undefined" && typeof exports == "object") {', ' // Node/CommonJS style', ' module.exports = factory( require("rangy") );', From af14f057ddfca0c4247a71340220abfcc7d7bde1 Mon Sep 17 00:00:00 2001 From: Dav Hill Date: Wed, 23 Mar 2016 19:38:22 +0000 Subject: [PATCH 2/2] Bump version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 91c2daef..950e3fc4 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "rangy", "description": "A cross-browser DOM range and selection library", - "version": "1.3.1-dev", + "version": "1.3.2", "author": { "name": "Tim Down", "email": "tim@timdown.co.uk",