Skip to content

Commit

Permalink
Include arte/rangy/toolbar version in the combined/minified files.
Browse files Browse the repository at this point in the history
  • Loading branch information
HarminderSingh1 committed Feb 6, 2014
1 parent cd02039 commit 3210f90
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 14 deletions.
10 changes: 5 additions & 5 deletions Demo/Demo.html
Original file line number Diff line number Diff line change
Expand Up @@ -76,17 +76,17 @@ <h4>Various events raised by Arte</h4>
<script type="text/javascript" src="demo.js"></script>

<!-- Aggregated Files -->
<script type="text/javascript" src="../Release/V0.1/Rangy.debug.js"></script>
<script type="text/javascript" src="../Release/V0.1/Arte.debug.js"></script>
<!-- <script type="text/javascript" src="../Release/V0.1/Toolbar.debug.js"></script>-->
<script type="text/javascript" src="../Release/Rangy.v1.2.3.debug.js"></script>
<script type="text/javascript" src="../Release/Arte.v0.2.debug.js"></script>
<script type="text/javascript" src="../Release/Toolbar.v0.2.debug.js"></script>

<!--Non Aggregated Files-->
<script type="text/javascript" src="../Toolbar/toolbar.js"></script>
<!-- <script type="text/javascript" src="../Toolbar/toolbar.js"></script>
<script type="text/javascript" src="../Toolbar/Buttons/Button.js"></script>
<script type="text/javascript" src="../Toolbar/Buttons/ButtonWithDropDown.js"></script>
<script type="text/javascript" src="../Toolbar/Buttons/ButtonWithDialog.js"></script>
<script type="text/javascript" src="../Toolbar/Configuration.js"></script>
<script type="text/javascript" src="../Toolbar/SelectionManager.js"></script>
<script type="text/javascript" src="../Toolbar/SelectionManager.js"></script>-->

</body>
</html>
4 changes: 2 additions & 2 deletions Editor/unittests/all.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
<script type="text/javascript" src="unitTestsHelper.js"></script>

<!--Files To Test-->
<script type="text/javascript" src="../../Release/v0.1/rangy.debug.js"></script>
<script type="text/javascript" src="../../Release/v0.1/arte.debug.js"></script>
<script type="text/javascript" src="../../Release/rangy.v1.2.3.debug.js"></script>
<script type="text/javascript" src="../../Release/arte.v0.2.debug.js"></script>


<!-- Add the test element id and selector-->
Expand Down
16 changes: 9 additions & 7 deletions Gruntfile.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
'use strict';

module.exports = function (grunt) {
var arteVersion = "v0.2";
var toolbarVersion = "v0.2";
var rangyVersion = 'v1.2.3';
// Project configuration.
grunt.initConfig({
jshint: {
Expand Down Expand Up @@ -35,11 +38,11 @@ module.exports = function (grunt) {
concat: {
RangyDebug: {
src: ['Editor/lib/rangy-1.2.3/**/*.js'],
dest: 'Release/v0.1/rangy.debug.js'
dest: 'Release/rangy.' + rangyVersion + '.debug.js'
},
RangyRelease: {
src: ['Build/Editor/lib/rangy-1.2.3/**/*.js'],
dest: 'Release/v0.1/rangy.min.js'
dest: 'Release/rangy.' + rangyVersion + '.min.js'
},
EditorDebug: {
src: ['Editor/core/Arte.js',
Expand All @@ -55,7 +58,7 @@ module.exports = function (grunt) {
'Editor/lib/rangy-extensions/rangy-extensions.js',
'Editor/plugins/**/*.js'
],
dest: 'Release/v0.1/arte.debug.js'
dest: 'Release/arte.' + arteVersion + '.debug.js'
},
EditorRelease: {
src: ['Build/Editor/core/Arte.js',
Expand All @@ -70,7 +73,7 @@ module.exports = function (grunt) {
'Build/Editor/lib/rangy-extensions/rangy-extensions.js',
'Build/Editor/plugins/**/*.js'
],
dest: 'Release/v0.1/arte.min.js'
dest: 'Release/arte.' + arteVersion + 'min.js'
},
ToolbarDebug: {
src: [
Expand All @@ -79,13 +82,12 @@ module.exports = function (grunt) {
'Toolbar/Buttons/*.js',
'Toolbar/*.js'
],
dest: "Release/v0.1/Toolbar.debug.js"
dest: 'Release/Toolbar.' + toolbarVersion + '.debug.js'
},
ToolbarRelease: {
src: ['Build/Toolbar/**/*.js'],
dest: "Release/v0.1/Toolbar.min.js"
dest: 'Release/Toolbar.' + toolbarVersion + '.min.js'
}

},

qunit: {
Expand Down

0 comments on commit 3210f90

Please sign in to comment.