From 39781e959741aae3fdbbed00d6510175dbea8383 Mon Sep 17 00:00:00 2001 From: Bill Keese Date: Thu, 11 Apr 2013 03:07:21 +0000 Subject: [PATCH] Fix module return values for various dojox modules, refs #13101 !strict. git-svn-id: http://svn.dojotoolkit.org/src/dojox/trunk@31211 560b804f-0ae3-0310-86f3-f6aa0a117693 --- av/FLVideo.js | 4 ++-- fx/Shadow.js | 7 ++++--- image/Badge.js | 4 +--- image/Lightbox.js | 8 +++----- string/BidiComplex.js | 2 +- string/BidiEngine.js | 4 ++-- string/Builder.js | 4 ++-- testing/DocTest.js | 3 +-- timing/Sequence.js | 4 ++-- timing/Streamer.js | 4 ++-- 10 files changed, 20 insertions(+), 24 deletions(-) diff --git a/av/FLVideo.js b/av/FLVideo.js index 0e4e19bf25..ac2697d925 100644 --- a/av/FLVideo.js +++ b/av/FLVideo.js @@ -2,7 +2,8 @@ define(['dojo', 'dijit', 'dijit/_Widget', 'dojox/embed/Flash', 'dojox/av/_Media' function(dojo, dijit, _Widget, Flash, _Media){ dojo.experimental("dojox.av.FLVideo"); -dojo.declare("dojox.av.FLVideo", [_Widget, _Media], { + +return dojo.declare("dojox.av.FLVideo", [_Widget, _Media], { // summary: // Inserts a Flash FLV video into the HTML page and provides methods @@ -318,5 +319,4 @@ dojo.declare("dojox.av.FLVideo", [_Widget, _Media], { } }); -return dojox.av.FLVideo; }); diff --git a/fx/Shadow.js b/fx/Shadow.js index 00a2e3f620..fa2aba6219 100644 --- a/fx/Shadow.js +++ b/fx/Shadow.js @@ -2,8 +2,10 @@ define(["dojo/_base/kernel", "dojo/_base/query" ,"dojo/_base/lang", "dojo/_base/ "dojo/dom-construct", "dojo/dom-class", "dojo/dom-geometry", "dojo/_base/fx", "dojo/fx", "dijit/_Widget", "dojo/NodeList-fx"], function(kernel, query, lang, declare, has, domConstruct, domClass, domGeom, baseFx, coreFx, Widget, NodeListFx){ -kernel.experimental("dojox.fx.Shadow"); -declare("dojox.fx.Shadow", Widget,{ + + kernel.experimental("dojox.fx.Shadow"); + + return declare("dojox.fx.Shadow", Widget,{ // summary: // Adds a drop-shadow to a node. // example: @@ -149,5 +151,4 @@ declare("dojox.fx.Shadow", Widget,{ } } }); - return dojox.fx.Shadow; }); diff --git a/image/Badge.js b/image/Badge.js index f115d2fb63..e91d805fd6 100644 --- a/image/Badge.js +++ b/image/Badge.js @@ -4,7 +4,7 @@ function(dojo, dijit, dojox, _Widget, _TemplatedMixin){ dojo.experimental("dojox.image.Badge"); dojo.getObject("image", true, dojox); - dojo.declare("dojox.image.Badge", [_Widget, _TemplatedMixin], { + return dojo.declare("dojox.image.Badge", [_Widget, _TemplatedMixin], { // summary: // A simple grid of Images that loops through thumbnails @@ -230,7 +230,5 @@ function(dojo, dijit, dojox, _Widget, _TemplatedMixin){ } }); - - return dojox.image.Badge; }); diff --git a/image/Lightbox.js b/image/Lightbox.js index 474a2ab90f..b8d682abab 100644 --- a/image/Lightbox.js +++ b/image/Lightbox.js @@ -3,7 +3,7 @@ define(["dojo", "dijit", "dojox", "dojo/text!./resources/Lightbox.html", "dijit/ dojo.experimental("dojox.image.Lightbox"); dojo.getObject("image", true, dojox); - dojo.declare("dojox.image.Lightbox", dijit._Widget, { + var Lightbox = dojo.declare("dojox.image.Lightbox", dijit._Widget, { // summary: // A dojo-based Lightbox implementation. // description: @@ -130,7 +130,7 @@ define(["dojo", "dijit", "dojox", "dojo/text!./resources/Lightbox.html", "dijit/ }); - dojo.declare("dojox.image.LightboxDialog", + Lightbox.LightboxDialog = dojo.declare("dojox.image.LightboxDialog", dijit.Dialog, { // summary: // The "dialog" shared between any Lightbox instances on the page, publically available @@ -620,9 +620,7 @@ define(["dojo", "dijit", "dojox", "dojo/text!./resources/Lightbox.html", "dijit/ } } }); - - - return dojox.image.Lightbox; + return Lightbox; }); diff --git a/string/BidiComplex.js b/string/BidiComplex.js index 912aaca741..c5ba151257 100644 --- a/string/BidiComplex.js +++ b/string/BidiComplex.js @@ -311,5 +311,5 @@ define(["dojo/_base/kernel", "dojo/_base/lang", "dojo/_base/array", "dojo/_base/ } return segmentsPointers; }; - return dojox.string.BidiComplex; + return bdc; }); diff --git a/string/BidiEngine.js b/string/BidiEngine.js index a91827082c..47fd6203fc 100644 --- a/string/BidiEngine.js +++ b/string/BidiEngine.js @@ -2,7 +2,7 @@ define(["dojo/_base/lang", "dojo/_base/declare"], function(lang,declare){ lang.getObject("string", true, dojox); -declare("dojox.string.BidiEngine", null, { +var BidiEngine = declare("dojox.string.BidiEngine", null, { // summary: // This class provides a bidi transformation engine, i.e. // functions for reordering and shaping bidi text. @@ -1533,5 +1533,5 @@ delete LRO; delete RLO; delete BN; -return dojox.string.BidiEngine; +return BidiEngine; }); diff --git a/string/Builder.js b/string/Builder.js index 4b8205cf59..ed4c94954c 100644 --- a/string/Builder.js +++ b/string/Builder.js @@ -1,6 +1,6 @@ define(["dojo/_base/lang"], function(lang){ - lang.getObject("string", true, dojox).Builder = + var Builder = lang.getObject("string", true, dojox).Builder = function(/*String?*/str){ // summary: // A fast buffer for creating large strings. @@ -130,5 +130,5 @@ define(["dojo/_base/lang"], // initialize the buffer. if(str){ this.append(str); } }; - return dojox.string.Builder; + return Builder; }); diff --git a/testing/DocTest.js b/testing/DocTest.js index 81e2e093bf..81570b8fb4 100644 --- a/testing/DocTest.js +++ b/testing/DocTest.js @@ -1,6 +1,6 @@ define("dojox/testing/DocTest", ["dojo/string"], function() { -dojo.declare( +return dojo.declare( "dojox.testing.DocTest", null, { @@ -278,5 +278,4 @@ dojo.declare( } ); -return dojox.testing.DocTest; }); \ No newline at end of file diff --git a/timing/Sequence.js b/timing/Sequence.js index 1d003027e9..4741c41671 100644 --- a/timing/Sequence.js +++ b/timing/Sequence.js @@ -6,7 +6,8 @@ define([ "./_base" ], function(dojo){ dojo.experimental("dojox.timing.Sequence"); - dojo.declare("dojox.timing.Sequence", null, { + + return dojo.declare("dojox.timing.Sequence", null, { // summary: // This class provides functionality to really sequentialize // function calls. You need to provide a list of functions and @@ -152,5 +153,4 @@ define([ } }); - return dojox.timing.Sequence; }); diff --git a/timing/Streamer.js b/timing/Streamer.js index 2132e59e4c..08ab563a16 100644 --- a/timing/Streamer.js +++ b/timing/Streamer.js @@ -1,6 +1,7 @@ define(["./_base"], function(){ dojo.experimental("dojox.timing.Streamer"); - dojox.timing.Streamer = function( + + return dojox.timing.Streamer = function( /* function */input, /* function */output, /* int */interval, @@ -90,5 +91,4 @@ define(["./_base"], function(){ queue.concat(initialData); } }; - return dojox.timing.Streamer; });