Issue #105 making objective more discoverable

README.md

@@ -119,4 +119,6 @@ Or reported an issue that was successfully closed!
 * Ben Heavner
 * Michael (mick-d)
 * Adam Brewer
+* Tobias Pfeiffer
+* Nicholas "LB" Braden
 

build/bundle.js

@@ -5742,7 +5742,7 @@ require.define("/src/js/intl/strings.js",function(require,module,exports,__dirna
   ///////////////////////////////////////////////////////////////////////////
   'help-vague-level': {
     '__desc__': 'When you are in a level and you say help, its vague and you need to specify',
-    'en_US': 'You are in a level, so multiple forms of help are available. Please select either "help level" or "help general"',
+    'en_US': 'You are in a level, so multiple forms of help are available. Please select either "help level" to learn more about this lesson, "help general" for using Learn GitBranching, or "objective" to learn about how to solve the level.',
     'zh_CN': '您正在关卡中，这里有多种形式的帮助，请选择 "help level" (关卡帮助)或 "help general" (一般帮助)'
   },
   ///////////////////////////////////////////////////////////////////////////
@@ -6111,9 +6111,11 @@ var Level = Sandbox.extend({
       return;
     }
 
-    var dialog = _.clone(intl.getStartDialog(levelObj));
+    debugger;
+    console.log(intl.getStartDialog(levelObj));
+    var dialog = $.extend({}, intl.getStartDialog(levelObj));
     // grab the last slide only
-    dialog.childViews = dialog.childViews.splice(-1);
+    dialog.childViews = dialog.childViews.slice(-1);
     new MultiView(_.extend(
       dialog,
       { deferred: deferred }
@@ -11016,6 +11018,9 @@ var CommandsHelperBar = HelperBar.extend({
     }, {
       text: 'Undo',
       id: 'undo'
+    }, {
+      text: 'Objective',
+      id: 'objectve'
     }, {
       text: 'Help',
       id: 'help'
@@ -11030,6 +11035,10 @@ var CommandsHelperBar = HelperBar.extend({
     HelperBar.prototype.fireCommand.apply(this, arguments);
   },
 
+  onObjectiveClick: function() {
+    this.fireCommand('objective');
+  },
+
   onLevelsClick: function() {
     this.fireCommand('levels');
   },
@@ -26422,7 +26431,7 @@ require.define("/src/js/intl/strings.js",function(require,module,exports,__dirna
   ///////////////////////////////////////////////////////////////////////////
   'help-vague-level': {
     '__desc__': 'When you are in a level and you say help, its vague and you need to specify',
-    'en_US': 'You are in a level, so multiple forms of help are available. Please select either "help level" or "help general"',
+    'en_US': 'You are in a level, so multiple forms of help are available. Please select either "help level" to learn more about this lesson, "help general" for using Learn GitBranching, or "objective" to learn about how to solve the level.',
     'zh_CN': '您正在关卡中，这里有多种形式的帮助，请选择 "help level" (关卡帮助)或 "help general" (一般帮助)'
   },
   ///////////////////////////////////////////////////////////////////////////
@@ -27161,9 +27170,11 @@ var Level = Sandbox.extend({
       return;
     }
 
-    var dialog = _.clone(intl.getStartDialog(levelObj));
+    debugger;
+    console.log(intl.getStartDialog(levelObj));
+    var dialog = $.extend({}, intl.getStartDialog(levelObj));
     // grab the last slide only
-    dialog.childViews = dialog.childViews.splice(-1);
+    dialog.childViews = dialog.childViews.slice(-1);
     new MultiView(_.extend(
       dialog,
       { deferred: deferred }
@@ -30908,6 +30919,9 @@ var CommandsHelperBar = HelperBar.extend({
     }, {
       text: 'Undo',
       id: 'undo'
+    }, {
+      text: 'Objective',
+      id: 'objectve'
     }, {
       text: 'Help',
       id: 'help'
@@ -30922,6 +30936,10 @@ var CommandsHelperBar = HelperBar.extend({
     HelperBar.prototype.fireCommand.apply(this, arguments);
   },
 
+  onObjectiveClick: function() {
+    this.fireCommand('objective');
+  },
+
   onLevelsClick: function() {
     this.fireCommand('levels');
   },

index.html

@@ -426,7 +426,7 @@
        For a much easier time perusing the source, see the individual files at:
           https://github.com/pcottle/learnGitBranching
   -->
-  <script src="build/bundle.min.20218ff4.js"></script>
+  <script src="build/bundle.min.e82289be.js"></script>
 
   <!-- The advantage of github pages: super-easy, simple, slick static hostic.
        The downside? No raw logs to parse for analytics, so I have to include

src/js/intl/strings.js

@@ -393,7 +393,7 @@ exports.strings = {
   ///////////////////////////////////////////////////////////////////////////
   'help-vague-level': {
     '__desc__': 'When you are in a level and you say help, its vague and you need to specify',
-    'en_US': 'You are in a level, so multiple forms of help are available. Please select either "help level" or "help general"',
+    'en_US': 'You are in a level, so multiple forms of help are available. Please select either "help level" to learn more about this lesson, "help general" for using Learn GitBranching, or "objective" to learn about how to solve the level.',
     'zh_CN': '您正在关卡中，这里有多种形式的帮助，请选择 "help level" (关卡帮助)或 "help general" (一般帮助)'
   },
   ///////////////////////////////////////////////////////////////////////////

src/js/level/index.js

@@ -88,9 +88,11 @@ var Level = Sandbox.extend({
       return;
     }
 
-    var dialog = _.clone(intl.getStartDialog(levelObj));
+    debugger;
+    console.log(intl.getStartDialog(levelObj));
+    var dialog = $.extend({}, intl.getStartDialog(levelObj));
     // grab the last slide only
-    dialog.childViews = dialog.childViews.splice(-1);
+    dialog.childViews = dialog.childViews.slice(-1);
     new MultiView(_.extend(
       dialog,
       { deferred: deferred }

src/js/views/index.js

@@ -704,6 +704,9 @@ var CommandsHelperBar = HelperBar.extend({
     }, {
       text: 'Undo',
       id: 'undo'
+    }, {
+      text: 'Objective',
+      id: 'objectve'
     }, {
       text: 'Help',
       id: 'help'
@@ -718,6 +721,10 @@ var CommandsHelperBar = HelperBar.extend({
     HelperBar.prototype.fireCommand.apply(this, arguments);
   },
 
+  onObjectiveClick: function() {
+    this.fireCommand('objective');
+  },
+
   onLevelsClick: function() {
     this.fireCommand('levels');
   },