Merge branch 'master' of https://github.com/plotly/MATLAB-api into enterprise_signin_dev

Author: BRONSOLO

README.md

@@ -1,4 +1,4 @@
-## MATLAB PLOTLY API WRAPPER 2.1.4
+## MATLAB PLOTLY API WRAPPER 2.1.6
 
 ### NUTSHELL:
 

plotly/plotly_aux/checkescape.m

@@ -1,4 +1,4 @@
-function [ escaped_val ] = check_escape(val)
+function escaped_val = checkescape(val)
 %adds '\' escape character if needed
 ec = '\';
 ind = find( (val == '"') | (val == '\' ) | (val == '/' ));

plotly/plotly_aux/m2json.m

@@ -34,6 +34,5 @@
             valstr = 'false';
         end
     else
-        disp [val ' iselse'];
         valstr = ''; % wtf is it?
     end

plotly/plotly_aux/plotly_version.m

@@ -1,3 +1,3 @@
 function version = plotly_version()
-    version = '2.1.4';
+    version = '2.1.6';
 end

plotly/plotly_help_aux/plotly_reference.mat

@@ -34,7 +34,7 @@
     switch patch_data.FaceColor
 
         case 'none'
-            marker.color = 'rgba(0,0,0,0,)';
+            marker.color = 'rgba(0,0,0,0)';
 
         case {'flat','interp'}
 

plotly/plotlyfig_aux/helpers/extractPatchFace.m

@@ -134,7 +134,7 @@ function plotlysetup(username, api_key, varargin)
     end
 
 else %if octave
-    display('\nOctave users: Automatic Plotly API embedding coming soon!\n');
+    fprintf('\n\nOctave users: Automatic Plotly API embedding coming soon!\n\n');
 end %end check for matlab...
 
 try %save user credentials