Strip the getOptionsData helper

Since data rendering is now default in handlebars and the errors will reference data and also occur early in the dev process, the overhead both for wire size and runtime exec of this sanity check does not seem worthwhile.

src/helper-view.js

@@ -1,6 +1,6 @@
 /*global
     ServerMarshal,
-    $serverSide, createError, filterAncestors, getOptionsData,
+    $serverSide, createError, filterAncestors,
     normalizeHTMLAttributeOptions, viewHelperAttributeName
 */
 var viewPlaceholderAttributeName = 'data-view-tmp',
@@ -55,7 +55,7 @@ Handlebars.registerViewHelper = function(name, ViewClass, callback) {
   Handlebars.registerHelper(name, function() {
     var args = _.toArray(arguments),
         options = args.pop(),
-        declaringView = getOptionsData(options).view;
+        declaringView = options.data.view;
 
     // Evaluate any nested parameters that we may have to content with
     var expandTokens = expandHash(this, options.hash);

src/helpers/collection.js

@@ -1,6 +1,6 @@
 /* global
     $serverSide,
-    collectionElementAttributeName, createErrorMessage, getOptionsData, getParent,
+    collectionElementAttributeName, createErrorMessage, getParent,
     helperViewPrototype, normalizeHTMLAttributeOptions,
     viewRestoreAttribute
 */
@@ -179,7 +179,7 @@ Handlebars.registerViewHelper('collection', Thorax.CollectionHelperView, functio
 });
 
 Handlebars.registerHelper('collection-element', function(options) {
-  if (!getOptionsData(options).view.renderCollection) {
+  if (!options.data.view.renderCollection) {
     throw new Error(createErrorMessage('collection-element-helper'));
   }
   var hash = options.hash;

src/helpers/element.js

@@ -1,10 +1,10 @@
-/*global getOptionsData, normalizeHTMLAttributeOptions */
+/*global normalizeHTMLAttributeOptions */
 var elementPlaceholderAttributeName = 'data-element-tmp';
 
 Handlebars.registerHelper('element', function(element, options) {
   normalizeHTMLAttributeOptions(options.hash);
   var cid = _.uniqueId('element'),
-      declaringView = getOptionsData(options).view;
+      declaringView = options.data.view;
   options.hash[elementPlaceholderAttributeName] = cid;
   declaringView._elementsByCid || (declaringView._elementsByCid = {});
   declaringView._elementsByCid[cid] = element;

src/helpers/empty.js

@@ -1,9 +1,8 @@
-/*global getOptionsData */
 Handlebars.registerHelper('empty', function(dataObject, options) {
   if (arguments.length === 1) {
     options = dataObject;
   }
-  var view = getOptionsData(options).view;
+  var view = options.data.view;
   if (arguments.length === 1) {
     dataObject = view.model;
   }

src/helpers/loading.js

@@ -1,6 +1,5 @@
-/*global getOptionsData */
 Handlebars.registerHelper('loading', function(options) {
-  var view = getOptionsData(options).view;
+  var view = options.data.view;
   view.off('change:load-state', onLoadStateChange, view);
   view.on('change:load-state', onLoadStateChange, view);
   return view._isLoading ? options.fn(this) : options.inverse(this);

src/helpers/super.js

@@ -1,7 +1,7 @@
-/* global createErrorMessage, getOptionsData */
+/* global createErrorMessage */
 
 Handlebars.registerHelper('super', function(options) {
-  var declaringView = getOptionsData(options).view,
+  var declaringView = options.data.view,
       parent = declaringView.constructor && declaringView.constructor.__super__;
   if (parent) {
     var template = parent.template;

src/helpers/template.js

@@ -1,4 +1,3 @@
-/*global getOptionsData */
 Handlebars.registerHelper('template', function(name, options) {
   /*jshint -W089 */
   var hasHash = false;
@@ -16,10 +15,10 @@ Handlebars.registerHelper('template', function(name, options) {
     context = _.extend({fn: options && options.fn}, context, options.hash);
   }
 
-  var output = getOptionsData(options).view.renderTemplate(name, context);
+  var output = options.data.view.renderTemplate(name, context);
   return new Handlebars.SafeString(output);
 });
 
 Handlebars.registerHelper('yield', function(options) {
-  return getOptionsData(options).yield && options.data.yield();
+  return options.data.yield();
 });

src/layout.js

@@ -1,6 +1,6 @@
 /*global
     $serverSide, FruitLoops,
-    createErrorMessage, getLayoutViewsTargetElement, getOptionsData,
+    createErrorMessage, getLayoutViewsTargetElement,
     normalizeHTMLAttributeOptions, viewNameAttributeName
 */
 var layoutCidAttributeName = 'data-layout-cid';
@@ -110,7 +110,7 @@ Thorax.LayoutView.on('after-restore', function() {
 });
 
 Handlebars.registerHelper('layout-element', function(options) {
-  var view = getOptionsData(options).view;
+  var view = options.data.view;
   // duck type check for LayoutView
   if (!view.getView) {
     throw new Error(createErrorMessage('layout-element-helper'));

src/util.js

@@ -202,13 +202,6 @@ function addEvents(target, source, context, listenToObject) {
   });
 }
 
-function getOptionsData(options) {
-  if (!options || !options.data) {
-    throw new Error(createErrorMessage('handlebars-no-data'));
-  }
-  return options.data;
-}
-
 // In helpers "tagName" or "tag" may be specified, as well
 // as "class" or "className". Normalize to "tagName" and
 // "className" to match the property names used by Backbone