Implements strings.json string-loading strategy.

Gruntfile.js

@@ -248,6 +248,7 @@ module.exports = function(grunt) {
 
   // Run all tests.
   grunt.registerTask('test', [
+    'compile:min',
     'clean:fixtures',
     'phpunit',
     'jasmine'

NeatlineWaypointsPlugin.php

@@ -69,7 +69,6 @@ public function hookNeatlinePublicTemplates($args)
     public function hookNeatlineEditorTemplates($args)
     {
         if ($args['exhibit']->hasWidget(self::ID)) {
-            echo get_view()->partial('waypoints/editor/strings.php');
             echo get_view()->partial('waypoints/editor/form.php');
             echo get_view()->partial('waypoints/editor/list.php');
         }
@@ -112,9 +111,7 @@ public function hookNeatlineEditorStatic($args)
      */
     public function filterNeatlineExhibitWidgets($widgets)
     {
-        return array_merge($widgets, array(
-            self::NAME => self::ID
-        ));
+        return array_merge($widgets, array(self::NAME => self::ID));
     }
 
 
@@ -126,39 +123,38 @@ public function filterNeatlineExhibitWidgets($widgets)
      */
     public function filterNeatlineRecordWidgets($widgets)
     {
-        return array_merge($widgets, array(
-            self::NAME => self::ID
-        ));
+        return array_merge($widgets, array(self::NAME => self::ID));
     }
 
 
     /**
-     * Register ordering API endpoint on `Neatline.g`.
+     * Register the exhibit widget tab.
      *
-     * @param array $globals The array of global properties.
-     * @param array $args Array of arguments, with `exhibit`.
+     * @param array $tabs Tabs, <LABEL> => <ID>.
      * @return array The modified array.
      */
-    public function filterNeatlineGlobals($globals, $args)
+    public function filterNeatlineExhibitTabs($tabs, $args)
     {
-        return array_merge($globals, array('waypoints' => array(
-            'order_api' => url('neatline-waypoints')
-        )));
+        if ($args['exhibit']->hasWidget(self::ID)) {
+            $tabs[self::NAME] = 'waypoints';
+        }
+        return $tabs;
     }
 
 
     /**
-     * Register the exhibit widget tab.
+     * Register ordering API endpoint on `Neatline.g`.
      *
-     * @param array $tabs Tabs, <LABEL> => <ID>.
+     * @param array $globals The array of global properties.
+     * @param array $args Array of arguments, with `exhibit`.
      * @return array The modified array.
      */
-    public function filterNeatlineExhibitTabs($tabs, $args)
+    public function filterNeatlineGlobals($globals, $args)
     {
-        if ($args['exhibit']->hasWidget(self::ID)) {
-            $tabs[self::NAME] = 'waypoints';
-        }
-        return $tabs;
+        return array_merge($globals, array('waypoints' => array(
+            'strings' => nl_getStrings(NL_WAYPOINTS_DIR.'/strings.json'),
+            'order_api' => url('neatline-waypoints')
+        )));
     }
 
 

strings.json

@@ -0,0 +1,16 @@
+{
+
+  "order": {
+
+    "save": {
+      "success": "The waypoint order was saved successfully!",
+      "error": "There was an error - the waypoint order was not saved."
+    },
+
+    "placeholders": {
+      "empty": "No waypoints have been added yet!"
+    }
+
+  }
+
+}

tests/jasmine/tests/editor/Open.spec.js

@@ -85,7 +85,11 @@ describe('Editor | Open Form', function() {
       // be displayed under "Edit Waypoint Order."
       // ----------------------------------------------------------------------
 
-      expect($(rows[0])).toHaveText(WP_STRINGS.order.placeholders.empty);
+      // Placeholder text.
+      var empty = Neatline.g.waypoints.strings.order.placeholders.empty;
+      expect($(rows[0])).toHaveText(empty);
+
+      // No waypoints listed.
       expect(rows.length).toEqual(1);
 
     });
@@ -106,9 +110,8 @@ describe('Editor | Open Form', function() {
       // The row with the placeholder message should not be sortable.
       // ----------------------------------------------------------------------
 
-      expect(
-        WP.v.editor.__ui.list.sortable('option', 'disabled')
-      ).toBeTruthy();
+      var cantSort = WP.v.editor.__ui.list.sortable('option', 'disabled');
+      expect(cantSort).toBeTruthy();
 
     });
 

tests/jasmine/tests/editor/Save.spec.js

@@ -83,7 +83,7 @@ describe('Editor | Save Order', function() {
 
     // Should flash success.
     expect(toastr.info).toHaveBeenCalledWith(
-      WP_STRINGS.order.save.success
+      Neatline.g.waypoints.strings.order.save.success
     );
 
   });
@@ -104,7 +104,7 @@ describe('Editor | Save Order', function() {
 
     // Should flash error.
     expect(toastr.error).toHaveBeenCalledWith(
-      WP_STRINGS.order.save.error
+      Neatline.g.waypoints.strings.order.save.error
     );
 
   });

views/shared/javascripts/editor/waypoints.view.js

@@ -142,7 +142,7 @@ Neatline.module('Editor.Exhibit.Waypoints', function(Waypoints) {
 
       // Flash success message.
       Neatline.execute('EDITOR:notifySuccess',
-        WP_STRINGS.order.save.success
+        Neatline.g.waypoints.strings.order.save.success
       );
 
     },
@@ -155,7 +155,7 @@ Neatline.module('Editor.Exhibit.Waypoints', function(Waypoints) {
 
       // Flash error message.
       Neatline.execute('EDITOR:notifyError',
-        WP_STRINGS.order.save.error
+        Neatline.g.waypoints.strings.order.save.error
       );
 
     }

views/shared/waypoints/editor/list.php

@@ -16,7 +16,7 @@
   <!-- Placeholder. -->
   <% if (records.length == 0) { %>
     <div class="alert alert-info">
-      <%= WP_STRINGS.order.placeholders.empty %>
+      <%= Neatline.g.waypoints.strings.order.placeholders.empty %>
     </div>
   <% } %>