Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Uses the method from ajaxSettings instead of passed in #424

Open
wants to merge 16 commits into
base: master
Choose a base branch
from

Commits on May 24, 2015

  1. Uses the method from ajaxSettings instead of passed in

    If you override ajaxSettings and change the method/type, it was
    getting ignored in _ajax(). This uses the ajaxSettings method rather
    than the one passed in, giving users the ability to talk to
    non-traditional APIs.
    Paul Oliver committed May 24, 2015
    Configuration menu
    Copy the full SHA
    ddd6475 View commit details
    Browse the repository at this point in the history
  2. ran grunt build to update ember-model.js

    Paul Oliver committed May 24, 2015
    Configuration menu
    Copy the full SHA
    904b9c5 View commit details
    Browse the repository at this point in the history

Commits on May 25, 2015

  1. Allows you to specify your own success/error callback in ajaxSettings

    You can specify a callback on success/error in your ajaxSettings so you
    can do something like:
    
    var mySuccess = function(data, status, jqXHR) {
      console.log("success");
    }
    
    var myError = function(jqXHR, status, error) {
      console.warn("error");
    }
    
    var ajaxSettings = function(url, method) {
      return {
        url: url,
        type: method,
        successCallback: mySuccess,
        errorCallback: myError
      };
    }
    c0achmcguirk committed May 25, 2015
    Configuration menu
    Copy the full SHA
    e07f533 View commit details
    Browse the repository at this point in the history

Commits on May 26, 2015

  1. Configuration menu
    Copy the full SHA
    f346722 View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2015

  1. Gives you the ability to override both dataType and contentType

    If your API is a bit goofy you can override the ajaxSettings in your
    RESTAdapter so you can do things like:
    
    --> POST URL-Encoded, receive JSON back:
    
      myModel.adapter = RESTAdapter.extend({
        ajaxSettings: function(url) {
          type: "POST",
          contentType: "application/x-www-form-urlencoded",
          dataType: "json"
          // ... snip other properties
        }
      });
    
    --> PUT JSON encoded content, receive text back
    
      myModel.adapter = RESTAdapter.extend({
        ajaxSettings: function(url) {
          type: "PUT",
          contentType: "json",
          dataType: "text"
          // ... snip other properties
        }
      });
    Paul Oliver committed Jun 3, 2015
    Configuration menu
    Copy the full SHA
    8619189 View commit details
    Browse the repository at this point in the history
  2. Copies dist/ember-model.js to the root folder

    Paul Oliver committed Jun 3, 2015
    Configuration menu
    Copy the full SHA
    fa02e94 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    1300b68 View commit details
    Browse the repository at this point in the history
  4. Compatibility with ember 1.13.0-beta.2

    juggy authored and Paul Oliver committed Jun 3, 2015
    Configuration menu
    Copy the full SHA
    247860a View commit details
    Browse the repository at this point in the history
  5. update release

    juggy authored and Paul Oliver committed Jun 3, 2015
    Configuration menu
    Copy the full SHA
    b4b9926 View commit details
    Browse the repository at this point in the history
  6. Fixes vestigial tail from bad merge

    Paul Oliver committed Jun 3, 2015
    Configuration menu
    Copy the full SHA
    708b7f6 View commit details
    Browse the repository at this point in the history
  7. Removes default contentType from ajaxSettings

    This was causing previously working calls to fail because now our ajax
    calls have the Content-Type: header being added, making the server
    return a 400 Bad Request error.
    Paul Oliver committed Jun 3, 2015
    Configuration menu
    Copy the full SHA
    095b585 View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2015

  1. Merge remote-tracking branch 'ebryn/master'

    # Conflicts:
    #	ember-model.js
    #	packages/ember-model/lib/attr.js
    #	packages/ember-model/lib/belongs_to.js
    #	packages/ember-model/lib/has_many.js
    #	packages/ember-model/lib/rest_adapter.js
    Paul Oliver committed Nov 20, 2015
    Configuration menu
    Copy the full SHA
    6b0a69e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    d5a123b View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2016

  1. Merge remote-tracking branch 'ebryn/master' into update

    # Conflicts:
    #	ember-model.js
    Paul Oliver committed Apr 3, 2016
    Configuration menu
    Copy the full SHA
    d4f73d8 View commit details
    Browse the repository at this point in the history
  2. fixed typo from bad merge

    Paul Oliver committed Apr 3, 2016
    Configuration menu
    Copy the full SHA
    2d63621 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    9c5302a View commit details
    Browse the repository at this point in the history