Merge branch 'we-are-vertigo' into presenter-latest

# Conflicts:
#	composer.json

Author: NiallSmyth

src/Presenters/Application/Pager/Pager.php

@@ -123,7 +123,11 @@ protected function beforeRenderView()
         // that the data our collection uses is modified and because the collection is already
         // fetched, any presenters using the collection won't see the modification.
 
-        $this->setPageNumber($this->model->PageNumber);
+        try {
+            $this->setPageNumber($this->model->PageNumber);
+        } catch (PagerOutOfBoundsException $ex) {
+            $this->setPageNumber(1);
+        }
 
         $this->view->setNumberOfPages($this->NumberOfPages);
         $this->view->setNumberPerPage($this->model->PerPage);

src/Presenters/Application/Table/Columns/ModelColumn.php

@@ -27,7 +27,6 @@
 use Rhubarb\Stem\Schema\Columns\BooleanColumn;
 use Rhubarb\Stem\Schema\Columns\Column;
 use Rhubarb\Stem\Schema\Columns\DateColumn;
-use Rhubarb\Stem\Schema\Columns\Float;
 use Rhubarb\Stem\Schema\Columns\FloatColumn;
 use Rhubarb\Stem\Schema\Columns\IntegerColumn;
 use Rhubarb\Stem\Schema\Columns\MoneyColumn;
@@ -121,4 +120,4 @@ public function getSortableColumnName()
     {
         return $this->sortColumnName;
     }
-}
+}

src/Presenters/Controls/Buttons/button.js

@@ -5,6 +5,10 @@ var button = function (presenterPath) {
 
     window.rhubarb.viewBridgeClasses.JqueryHtmlViewBridge.apply(this, arguments);
 
+    if (arguments.length == 0) {
+        return;
+    }
+
     this.useXmlRpc = ( this.element.attr("xmlrpc") == "yes" );
 
     if (this.element.attr("confirm")) {

src/Presenters/Controls/DateTime/date-picker.js

@@ -51,7 +51,7 @@ datePicker.prototype.getSerializableValue = function() {
     var date = this.getDate();
 
     if (date == null) {
-        return null;
+        return '';
     }
 
     return date.getDate() + '/' + (date.getMonth() + 1) + '/' + date.getFullYear();

src/Presenters/Controls/FileUpload/MultipleHtmlFileUpload.php

@@ -20,8 +20,35 @@
 
 require_once __DIR__ . '/SimpleHtmlFileUpload.php';
 
+/**
+ * @property int $MaxFileSize
+ */
 class MultipleHtmlFileUpload extends SimpleHtmlFileUpload
 {
+    protected function initialiseModel()
+    {
+        parent::initialiseModel();
+
+        if ($this->MaxFileSize == null) {
+            $returnBytes = function ($val) {
+                $val = trim($val);
+                $last = strtolower($val[strlen($val) - 1]);
+                switch ($last) {
+                    case 'g':
+                        $val *= 1024;
+                    case 'm':
+                        $val *= 1024;
+                    case 'k':
+                        $val *= 1024;
+                }
+
+                return $val;
+            };
+
+            $this->MaxFileSize = min($returnBytes(ini_get('upload_max_filesize')), $returnBytes(ini_get('post_max_size')));
+        }
+    }
+
     protected function getPublicModelPropertyList()
     {
         $properties = parent::getPublicModelPropertyList();
@@ -50,4 +77,4 @@ function () {
             }
         );
     }
-} 
+}

src/Presenters/Controls/FileUpload/MultipleHtmlFileUploadViewBridge.js

@@ -5,12 +5,6 @@ var bridge = function (presenterPath) {
 bridge.prototype = new window.rhubarb.viewBridgeClasses.SimpleHtmlFileUploadViewBridge();
 bridge.prototype.constructor = bridge;
 
-bridge.prototype.onStateLoaded = function () {
-    if (!this.model.MaxFileSize) {
-        this.model.MaxFileSize = 5 * 1024 * 1024;
-    }
-};
-
 bridge.prototype.supportsHtml5Uploads = function () {
     var xhr = new XMLHttpRequest();
 
@@ -49,7 +43,12 @@ bridge.prototype.filesSelected = function (files) {
     var self = this;
 
     for (var i = 0, file; file = files[i]; i++) {
-        var uploadFunction = function (file) {
+        if (this.model.MaxFileSize && file.size > this.model.MaxFileSize) {
+            this.onUploadFailed(file.name + ' is over the maximum file size of ' + this.formatBytes(this.model.MaxFileSize, 0));
+            continue;
+        }
+
+        var uploadFile = function (file) {
             self.sendFileAsServerEvent("FileUploadedXhr", file, function (e) {
                 var progress =
                 {
@@ -132,6 +131,22 @@ bridge.prototype.onUploadComplete = function (progressIndicator) {
     }, 3000);
 };
 
+bridge.prototype.onUploadFailed = function (message) {
+    var upiDom = document.createElement("div");
+    upiDom.className = "upload-failed";
+
+    var upiLabel = document.createElement("label");
+    upiLabel.innerHTML = message;
+
+    upiDom.appendChild(upiLabel);
+
+    this.attachUploadProgressIndicator(upiDom);
+
+    setTimeout(function () {
+        upiDom.parentNode.removeChild(upiDom);
+    }, 3000);
+};
+
 bridge.prototype.addClass = function (nodes, className) {
     if (!nodes.length) {
         nodes = [nodes];
@@ -157,4 +172,14 @@ bridge.prototype.removeClass = function (nodes, className) {
     }
 };
 
-window.rhubarb.viewBridgeClasses.MultipleHtmlFileUploadViewBridge = bridge;
+bridge.prototype.formatBytes = function (bytes, decimals) {
+    if (bytes == 0) {
+        return '0B';
+    }
+    var k = 1000;
+    var sizes = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
+    var i = Math.floor(Math.log(bytes) / Math.log(k));
+    return parseFloat((bytes / Math.pow(k, i)).toFixed(decimals)) + sizes[i];
+};
+
+window.rhubarb.viewBridgeClasses.MultipleHtmlFileUploadViewBridge = bridge;

src/Presenters/Controls/FileUpload/SimpleHtmlFileUploadViewBridge.js

@@ -14,4 +14,15 @@ bridge.spawn = function (spawnSettings, viewIndex, parentPresenterPath) {
     return element;
 };
 
-window.rhubarb.viewBridgeClasses.SimpleHtmlFileUploadViewBridge = bridge;
+bridge.prototype.reset = function ()
+{
+    var form = document.createElement("FORM");
+    var currentParent = this.viewNode.parentNode;
+    currentParent.insertBefore(form, this.viewNode);
+    form.appendChild(this.viewNode);
+    form.reset();
+    currentParent.insertBefore(this.viewNode, form);
+    currentParent.removeChild(form);
+};
+
+window.rhubarb.viewBridgeClasses.SimpleHtmlFileUploadViewBridge = bridge;

src/Presenters/Controls/Selection/RadioButtons/RadioButtonsView.php

@@ -41,4 +41,16 @@ public function getItemOptionHtml($value, $label, $item, $classSuffix = "radio")
     {
         return parent::getItemOptionHtml($value, $label, $item, $classSuffix);
     }
-}
+
+    protected function getClientSideViewBridgeName()
+    {
+        return 'RadioButtonsViewBridge';
+    }
+
+    public function getDeploymentPackage()
+    {
+        $package = parent::getDeploymentPackage();
+        $package->resourcesToDeploy[] = __DIR__ . '/RadioButtonsViewBridge.js';
+        return $package;
+    }
+}

src/Presenters/Controls/Selection/RadioButtons/RadioButtonsViewBridge.js

@@ -0,0 +1,27 @@
+var radioButtonsViewBridge = function (presenterPath) {
+    window.rhubarb.viewBridgeClasses.SelectionControlViewBridge.apply(this, arguments);
+
+    this.supportsMultipleSelection = false;
+};
+
+radioButtonsViewBridge.prototype = new window.rhubarb.viewBridgeClasses.SelectionControlViewBridge();
+radioButtonsViewBridge.prototype.constructor = radioButtonsViewBridge;
+
+radioButtonsViewBridge.prototype.setValue = function (value) {
+    this.element.find('input[type=radio][value=' + value + ']').prop('checked', true);
+
+    this.model.SelectedItems = [{"value": value}];
+
+    this.valueChanged();
+};
+
+radioButtonsViewBridge.prototype.valueChanged = function () {
+    var checked = this.element.find("input:checked");
+
+    this.model.SelectedItems = [{"value": checked.length ? checked.val() : null}];
+
+    // Calling our parent will ensure the new value gets raised as an event
+    window.rhubarb.viewBridgeClasses.SelectionControlViewBridge.prototype.valueChanged.apply(this, arguments);
+};
+
+window.rhubarb.viewBridgeClasses.RadioButtonsViewBridge = radioButtonsViewBridge;

src/Presenters/Controls/Text/TextBox/TextBoxView.php

@@ -107,6 +107,7 @@ public function getSpawnSettings()
         $settings["size"] = $this->size;
         $settings["maxLength"] = $this->maxLength;
         $settings["allowBrowserAutoComplete"] = $this->allowBrowserAutoComplete;
+        $settings["placeholderText"] = $this->placeholderText;
 
         return $settings;
     }

src/Presenters/Controls/Text/TextBox/TextBoxViewBridge.js

@@ -12,6 +12,9 @@ bridge.spawn = function (spawnData, index, parentPresenterPath) {
     if (spawnData.maxLength) {
         textBox.setAttribute("maxlength", spawnData.maxLength);
     }
+    if (spawnData.placeholderText) {
+        textBox.setAttribute("placeholder", spawnData.placeholderText);
+    }
 
     window.rhubarb.viewBridgeClasses.HtmlViewBridge.applyStandardAttributesToSpawnedElement(textBox, spawnData, index, parentPresenterPath);
 

src/Presenters/Presenter.php

@@ -1153,10 +1153,6 @@ public final function generateResponse($request = null)
         ob_start();
 
         if ($this->isExecutionTarget) {
-            if ($isAjax) {
-                print "<?xml version=\"1.0\"?><mvp>\r\n";
-            }
-
             // Process events and if based on those events our view setup might change we
             // will reinitialise them and run the events again. This is because a new view
             // configuration may involve different presenters that will need a chance to run their
@@ -1193,6 +1189,10 @@ public final function generateResponse($request = null)
         if ($isAjax) {
             $response = new HtmlResponse($this);
 
+            if ($isAjax) {
+                $html = "<?xml version=\"1.0\"?><mvp>\r\n" . $html;
+            }
+
             if ($this->isExecutionTarget) {
                 foreach ($modelChanges as $path => $modelChange) {
                     $html .= "<model id=\"" . $path . "\"><![CDATA[" . json_encode($modelChange) . "]]></model>";

src/Views/HtmlViewBridge.js

@@ -1008,7 +1008,14 @@ HtmlViewBridge.prototype.parseEventResponse = function (eventName, responseCode,
             var response = ( eventResponse.textContent ) ? eventResponse.textContent : eventResponse.text;
 
             if (eventResponse.getAttribute("type") == "json") {
-                response = JSON.parse(response);
+                try {
+                    response = JSON.parse(response);
+                } catch (exception) {
+                    if (failureCallback) {
+                        failureCallback(response, responseCode, exception);
+                        callBackCalled = true;
+                    }
+                }
             }
             else {
                 response = response.trim();