From 9038e59dc1068ea926a85a6f07990758685d5f90 Mon Sep 17 00:00:00 2001 From: Justin Obara Date: Thu, 1 Dec 2016 16:01:50 -0500 Subject: [PATCH] FLUID-6087: Updated copyrights for manual-tests Also fixed line endings --- .../inlineEdit/rich/js/inlineEditDemo.js | 1 + .../js/performance-test.js | 3 +- .../performance-get/js/performance-test.js | 3 +- .../assortedContent/js/assortedContent.js | 162 +++++++++--------- 4 files changed, 86 insertions(+), 83 deletions(-) diff --git a/tests/manual-tests/components/inlineEdit/rich/js/inlineEditDemo.js b/tests/manual-tests/components/inlineEdit/rich/js/inlineEditDemo.js index 56f04b5462..f0f49ca6a6 100644 --- a/tests/manual-tests/components/inlineEdit/rich/js/inlineEditDemo.js +++ b/tests/manual-tests/components/inlineEdit/rich/js/inlineEditDemo.js @@ -3,6 +3,7 @@ Copyright 2008-2009 University of Cambridge Copyright 2008-2010 University of Toronto Copyright 2008-2009 University of California, Berkeley Copyright 2010-2011 OCAD University +Copyright 2012 Raising the Floor - US Licensed under the Educational Community License (ECL), Version 2.0 or the New BSD license. You may not use this file except in compliance with one these diff --git a/tests/manual-tests/framework/core/performance-fastInvokers/js/performance-test.js b/tests/manual-tests/framework/core/performance-fastInvokers/js/performance-test.js index a93726b424..b41cd99495 100644 --- a/tests/manual-tests/framework/core/performance-fastInvokers/js/performance-test.js +++ b/tests/manual-tests/framework/core/performance-fastInvokers/js/performance-test.js @@ -1,5 +1,6 @@ /* -Copyright 2013 OCAD University +Copyright 2013-2014 OCAD University +Copyright 2015 Raising the Floor - International Licensed under the Educational Community License (ECL), Version 2.0 or the New BSD license. You may not use this file except in compliance with one these diff --git a/tests/manual-tests/framework/core/performance-get/js/performance-test.js b/tests/manual-tests/framework/core/performance-get/js/performance-test.js index e1ecfa9910..bdecb4ecaa 100644 --- a/tests/manual-tests/framework/core/performance-get/js/performance-test.js +++ b/tests/manual-tests/framework/core/performance-get/js/performance-test.js @@ -1,5 +1,6 @@ /* -Copyright 2010 OCAD University +Copyright 2010-2014 OCAD University +Copyright 2012 Raising the Floor - US Licensed under the Educational Community License (ECL), Version 2.0 or the New BSD license. You may not use this file except in compliance with one these diff --git a/tests/manual-tests/framework/preferences/assortedContent/js/assortedContent.js b/tests/manual-tests/framework/preferences/assortedContent/js/assortedContent.js index a91b88f652..83de29ecb5 100644 --- a/tests/manual-tests/framework/preferences/assortedContent/js/assortedContent.js +++ b/tests/manual-tests/framework/preferences/assortedContent/js/assortedContent.js @@ -1,81 +1,81 @@ -/* -Copyright 2011 OCAD University - -Licensed under the Educational Community License (ECL), Version 2.0 or the New -BSD license. You may not use this file except in compliance with one these -Licenses. - -You may obtain a copy of the ECL 2.0 License and BSD License at -https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt -*/ - -/* global fluid */ - -var assortedContent = assortedContent || {}; -(function ($, fluid) { - "use strict"; - - /* Our demo script */ - assortedContent.slidingPrefsEditor = function () { - // First, start up Settings Store and Page Enhancer - fluid.prefs.globalSettingsStore(); - fluid.pageEnhancer({ - uiEnhancer: { - gradeNames: ["fluid.uiEnhancer.starterEnactors"], - classnameMap: { - theme: { - "default": "assortedContent-theme-basic" - } - }, - tocTemplate: "../../../../../src/components/tableOfContents/html/TableOfContents.html" - } - }); - - fluid.defaults("fluid.assortedContent.native", { - iframeRenderer: { - markupProps: { - src: "../../../../../src/framework/preferences/html/SeparatedPanelPrefsEditorFrame-nativeHTML.html" - } - } - }); - - fluid.defaults("fluid.assortedContent.jQueryUI", { - iframeRenderer: { - markupProps: { - src: "../../../../../src/framework/preferences/html/SeparatedPanelPrefsEditorFrame-jQueryUI.html" - } - } - }); - - // Next, start up Preferences Editor - fluid.prefs.separatedPanel(".flc-prefsEditor-separatedPanel", { - gradeNames: ["fluid.prefs.transformDefaultPanelsOptions", "fluid.prefs.initialModel.starter", "fluid.contextAware"], - terms: { - templatePrefix: "../../../../../src/framework/preferences/html/", - messagePrefix: "../../../../../src/framework/preferences/messages/" - }, - messageLoader: { - gradeNames: ["fluid.prefs.starterMessageLoader"] - }, - templateLoader: { - gradeNames: ["fluid.prefs.starterSeparatedPanelTemplateLoader"] - }, - prefsEditor: { - gradeNames: ["fluid.prefs.starterPanels", "fluid.prefs.uiEnhancerRelay"] - }, - contextAwareness: { - sliderVariety: { - checks: { - jQueryUI: { - contextValue: "{fluid.prefsWidgetType}", - equals: "jQueryUI", - gradeNames: "fluid.assortedContent.jQueryUI" - } - }, - defaultGradeNames: "fluid.assortedContent.native" - } - } - }); - }; - -})(jQuery, fluid); +/* +Copyright 2011-2016 OCAD University + +Licensed under the Educational Community License (ECL), Version 2.0 or the New +BSD license. You may not use this file except in compliance with one these +Licenses. + +You may obtain a copy of the ECL 2.0 License and BSD License at +https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt +*/ + +/* global fluid */ + +var assortedContent = assortedContent || {}; +(function ($, fluid) { + "use strict"; + + /* Our demo script */ + assortedContent.slidingPrefsEditor = function () { + // First, start up Settings Store and Page Enhancer + fluid.prefs.globalSettingsStore(); + fluid.pageEnhancer({ + uiEnhancer: { + gradeNames: ["fluid.uiEnhancer.starterEnactors"], + classnameMap: { + theme: { + "default": "assortedContent-theme-basic" + } + }, + tocTemplate: "../../../../../src/components/tableOfContents/html/TableOfContents.html" + } + }); + + fluid.defaults("fluid.assortedContent.native", { + iframeRenderer: { + markupProps: { + src: "../../../../../src/framework/preferences/html/SeparatedPanelPrefsEditorFrame-nativeHTML.html" + } + } + }); + + fluid.defaults("fluid.assortedContent.jQueryUI", { + iframeRenderer: { + markupProps: { + src: "../../../../../src/framework/preferences/html/SeparatedPanelPrefsEditorFrame-jQueryUI.html" + } + } + }); + + // Next, start up Preferences Editor + fluid.prefs.separatedPanel(".flc-prefsEditor-separatedPanel", { + gradeNames: ["fluid.prefs.transformDefaultPanelsOptions", "fluid.prefs.initialModel.starter", "fluid.contextAware"], + terms: { + templatePrefix: "../../../../../src/framework/preferences/html/", + messagePrefix: "../../../../../src/framework/preferences/messages/" + }, + messageLoader: { + gradeNames: ["fluid.prefs.starterMessageLoader"] + }, + templateLoader: { + gradeNames: ["fluid.prefs.starterSeparatedPanelTemplateLoader"] + }, + prefsEditor: { + gradeNames: ["fluid.prefs.starterPanels", "fluid.prefs.uiEnhancerRelay"] + }, + contextAwareness: { + sliderVariety: { + checks: { + jQueryUI: { + contextValue: "{fluid.prefsWidgetType}", + equals: "jQueryUI", + gradeNames: "fluid.assortedContent.jQueryUI" + } + }, + defaultGradeNames: "fluid.assortedContent.native" + } + } + }); + }; + +})(jQuery, fluid);