Skip to content

Commit

Permalink
Merge pull request #1929 from Orange-OpenSource/grunt-watch-mss
Browse files Browse the repository at this point in the history
grunt: add watch task on dash.mss package
  • Loading branch information
Dan Sparacio committed Jun 2, 2017
2 parents 9be2840 + 9fce443 commit d297b9b
Show file tree
Hide file tree
Showing 3 changed files with 53 additions and 9 deletions.
14 changes: 7 additions & 7 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -201,24 +201,23 @@ module.exports = function (grunt) {
transform: ['babelify']
}
},
mss: {
all: {
files: {
'build/temp/dash.mss.debug.js': ['src/mss/MssHandler.js']
'build/temp/dash.all.debug.js': ['index.js']
},
options: {
browserifyOptions: {
debug: true,
standalone: 'dashjs.MssHandler'
debug: true
},
plugin: [
'browserify-derequire', 'bundle-collapser/plugin'
],
transform: ['babelify']
}
},
all: {
mss: {
files: {
'build/temp/dash.all.debug.js': ['index.js']
'build/temp/dash.mss.debug.js': ['src/mss/index.js']
},
options: {
browserifyOptions: {
Expand All @@ -233,7 +232,8 @@ module.exports = function (grunt) {

watch: {
files: {
'build/temp/dash.all.debug.js': ['index.js']
'build/temp/dash.all.debug.js': ['index.js'],
'build/temp/dash.mss.debug.js': ['src/mss/index.js']
},
options: {
watch: true,
Expand Down
3 changes: 1 addition & 2 deletions src/mss/MssHandler.js
Original file line number Diff line number Diff line change
Expand Up @@ -131,5 +131,4 @@ function MssHandler(config) {
}

MssHandler.__dashjs_factory_name = 'MssHandler';
let factory = FactoryMaker.getClassFactory(MssHandler);
export default factory;
export default FactoryMaker.getClassFactory(MssHandler);
45 changes: 45 additions & 0 deletions src/mss/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
/**
* The copyright in this software is being made available under the BSD License,
* included below. This software may be subject to other third party and contributor
* rights, including patent rights, and no such rights are granted under this license.
*
* Copyright (c) 2013, Dash Industry Forum.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification,
* are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation and/or
* other materials provided with the distribution.
* * Neither the name of Dash Industry Forum nor the names of its
* contributors may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS AS IS AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
* IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/

import MssHandler from './MssHandler';

// Shove both of these into the global scope
var context = (typeof window !== 'undefined' && window) || global;

var dashjs = context.dashjs;
if (!dashjs) {
dashjs = context.dashjs = {};
}

dashjs.MssHandler = MssHandler;

export default dashjs;
export { MssHandler };

0 comments on commit d297b9b

Please sign in to comment.