diff --git a/Gruntfile.js b/Gruntfile.js index 16f7be03..fb50f830 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -36,7 +36,7 @@ module.exports = function (grunt) { tasks: ['wiredep'] }, js: { - files: ['<%= yeoman.app %>/scripts/{,*/}*.js', '<%= yeoman.app %>/admin_components/**/*.js'], + files: ['<%= yeoman.app %>/scripts/{,*/}*.js', '<%= yeoman.app %>/admin_components/**/*.js', '<%= yeoman.app %>/services/*.js'], tasks: ['newer:jshint:all'], options: { livereload: '<%= connect.options.livereload %>' @@ -121,7 +121,8 @@ module.exports = function (grunt) { all: { src: [ 'Gruntfile.js', - '<%= yeoman.app %>/scripts/{,*/}*.js' + '<%= yeoman.app %>/scripts/{,*/}*.js', + '<%= yeoman.app %>/services/*.js' ] }, test: { diff --git a/app/admin_components/adf-scripts/dreamfactory-scripts.js b/app/admin_components/adf-scripts/dreamfactory-scripts.js index fb60c326..bc12fd7c 100644 --- a/app/admin_components/adf-scripts/dreamfactory-scripts.js +++ b/app/admin_components/adf-scripts/dreamfactory-scripts.js @@ -801,6 +801,12 @@ angular.module('dfScripts', ['ngRoute', 'dfUtility']) watchSelections(); watchApiData(); }); + + // TODO Temporary hack to handle view render. Need to replace with more explicit solution. + $scope.showTutorialStep = function (currentStepId, nextStepId) { + return FeatureTour.showStep(currentStepId, nextStepId); + } + }]) .directive('scriptSidebarMenu', ['MODSCRIPTING_ASSET_PATH', function (MODSCRIPTING_ASSET_PATH) { diff --git a/app/admin_components/adf-scripts/views/main.html b/app/admin_components/adf-scripts/views/main.html index 6a75ec65..3fb1b2d6 100644 --- a/app/admin_components/adf-scripts/views/main.html +++ b/app/admin_components/adf-scripts/views/main.html @@ -1,5 +1,5 @@ -
+
@@ -21,7 +21,7 @@
- +
@@ -47,7 +47,11 @@ data-input-format="currentScriptObj.type" data-is-editable="isEventScriptEditable" data-editor-obj="eventScriptEditorObj" - data-target-div="'eventScript'"> + data-target-div="'eventScript'" + data-tour="scripting" + data-step-1="show-script-editor" + data-step-2="fill-in-script" + >
diff --git a/app/admin_components/adf-scripts/views/script-sidebar-menu.html b/app/admin_components/adf-scripts/views/script-sidebar-menu.html index 2219849c..de0f5852 100644 --- a/app/admin_components/adf-scripts/views/script-sidebar-menu.html +++ b/app/admin_components/adf-scripts/views/script-sidebar-menu.html @@ -16,14 +16,17 @@
-
{{resource}} @@ -31,6 +34,9 @@
{{endpoint}} @@ -38,6 +44,9 @@
{{endpoint}} @@ -53,6 +62,8 @@
@@ -60,7 +71,7 @@
@@ -69,7 +80,7 @@