Rebuilt, fixed a merge conflict

extmvc · Feb 18, 2010 · 1e0e335 · 1e0e335
1 parent 5f3c31d
commit 1e0e335
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 16 deletions.
diff --git a/ext-mvc-all-min.js b/ext-mvc-all-min.js
diff --git a/ext-mvc-all.js b/ext-mvc-all.js
@@ -2240,11 +2240,11 @@ ExtMVC.lib.ViewClassManager = Ext.extend(ExtMVC.lib.ClassManager, {
    * @param {String} name The name of the view to turn from config object to class constructor
    */
   define: function define(name) {
-    var overrides = this.getRegistered(name),
-        xtype     = overrides.xtype || 'panel';
-
+    var overrides = this.getRegistered(name);
     if (overrides == undefined) this.throwViewNotFoundError(name);
 
+    var xtype = overrides.xtype || 'panel';
+
     delete overrides.xtype;
 
     //extend the class, register it if required
@@ -4242,11 +4242,11 @@ ExtMVC.model.plugin.adapter.RESTAdapter = Ext.extend(ExtMVC.model.plugin.adapter
           };
         }(instance, successFn, options.scope),
 
-        failure: function(instance, userCallback, scope) {
-          var scope = scope || this;
+        failure: function() {
+          var scope = options.scope || this;
 
-          userCallback.call(scope, instance);
-        }(instance, failureFn, options.scope)
+          failureFn.call(scope, instance);
+        }
       }, options)
     );
   },

diff --git a/lib/ViewClassManager.js b/lib/ViewClassManager.js
@@ -44,19 +44,11 @@ ExtMVC.lib.ViewClassManager = Ext.extend(ExtMVC.lib.ClassManager, {
    * @param {String} name The name of the view to turn from config object to class constructor
    */
   define: function define(name) {
-<<<<<<< HEAD
-    var overrides = this.getRegistered(name),
-        xtype     = overrides.xtype || 'panel';
-
-    if (overrides == undefined) this.throwViewNotFoundError(name);
-    
-=======
     var overrides = this.getRegistered(name);
     if (overrides == undefined) this.throwViewNotFoundError(name);
 
     var xtype = overrides.xtype || 'panel';
 
->>>>>>> 6b5fe90459bca48694d8e0534def3de5f76055cd
     delete overrides.xtype;
 
     //extend the class, register it if required