Merge branch 'master' of github.com:ajaxorg/apf

Author: mikedeboer

elements/button.js

@@ -374,15 +374,17 @@ apf.button  = function(struct, tagName){
         if (!menuPressed || menuPressed == this)
             return;
 
+        var menu = self[this.submenu];
+        if(menu.getAttribute('pinned'))
+            return;
+
         menuPressed.setValue(false);
         var oldMenu = self[menuPressed.submenu];
         oldMenu.$propHandlers["visible"].call(oldMenu, false, true);//.hide();
 
         this.setValue(true);
         this.parentNode.menuIsPressed = this;
 
-        var menu = self[this.submenu];
-
         //#ifdef __DEBUG
         if (!menu) {
             throw new Error(apf.formatErrorString(0, this,
@@ -511,7 +513,7 @@ apf.button  = function(struct, tagName){
         if (strEvent && this.dispatchEvent(strEvent, {htmlEvent: e}) === false)
             return;
 
-        if(parentNode.$button2 && parentNode.$button2.value && !this.submenu)
+        if(parentNode && parentNode.$button2 && parentNode.$button2.value && !this.submenu)
             return;
 
         this.$doBgSwitch(this.states[state]);

elements/rpc/rest.js

@@ -98,7 +98,7 @@ apf.rest = function(){
             apf.console.log("Found method " + options["http-method"] + ". Taking body from last argument");
         //#endif
 
-        var body    = "NOTIFY|SEND|POST|PUT".indexOf(options["http-method"]) > -1 ? args.pop() : "",
+        var body = "NOTIFY|SEND|POST|PUT".indexOf(options["http-method"].toUpperCase()) > -1 ? args.pop() : "",
             url;
 
         this.method = options["http-method"];