Merge "Convert File::getDescriptionText() to getWithSetCallback()"

diff --git a/includes/filebackend/FSFile.php b/includes/filebackend/FSFile.php
index 6311f76..8aa11b6 100644 (file)
--- a/includes/filebackend/FSFile.php
+++ b/includes/filebackend/FSFile.php
@@ -98,9 +98,22 @@ class FSFile {
         * Get an associative array containing information about
         * a file with the given storage path.
         *
+        * Resulting array fields include:
+        *   - fileExists
+        *   - size (filesize in bytes)
+        *   - mime (as major/minor)
+        *   - media_type (value to be used with the MEDIATYPE_xxx constants)
+        *   - metadata (handler specific)
+        *   - sha1 (in base 36)
+        *   - width
+        *   - height
+        *   - bits (bitrate)
+        *   - file-mime
+        *   - major_mime
+        *   - minor_mime
+        *
         * @param string|bool $ext The file extension, or true to extract it from the filename.
         *             Set it to false to ignore the extension.
-        *
         * @return array
         */
        public function getProps( $ext = true ) {
@@ -151,6 +164,16 @@ class FSFile {
        /**
         * Placeholder file properties to use for files that don't exist
         *
+        * Resulting array fields include:
+        *   - fileExists
+        *   - mime (as major/minor)
+        *   - media_type (value to be used with the MEDIATYPE_xxx constants)
+        *   - metadata (handler specific)
+        *   - sha1 (in base 36)
+        *   - width
+        *   - height
+        *   - bits (bitrate)
+        *
         * @return array
         */
        public static function placeholderProps() {
@@ -198,7 +221,6 @@ class FSFile {
         * @return bool|string False on failure
         */
        public function getSha1Base36( $recache = false ) {
-
                if ( $this->sha1Base36 !== null && !$recache ) {
                        return $this->sha1Base36;
                }

diff --git a/package.json b/package.json
index 8bfb94d..394f36e 100644 (file)
--- a/package.json
+++ b/package.json
@@ -6,8 +6,7 @@
     "postdoc": "grunt copy:jsduck"
   },
   "devDependencies": {
-    "grunt": "0.4.5",
-    "grunt-cli": "0.1.13",
+    "grunt": "1.0.1",
     "grunt-banana-checker": "0.5.0",
     "grunt-contrib-copy": "1.0.0",
     "grunt-contrib-jshint": "1.0.0",

diff --git a/resources/lib/oojs-ui/oojs-ui-core-apex.css b/resources/lib/oojs-ui/oojs-ui-core-apex.css
index 1d13c69..1accc2a 100644 (file)
--- a/resources/lib/oojs-ui/oojs-ui-core-apex.css
+++ b/resources/lib/oojs-ui/oojs-ui-core-apex.css
@@ -798,7 +798,7 @@
        overflow: auto;
 }
 .oo-ui-textInputWidget [type="search"] {
-       -webkit-appearance: texfield;
+       -webkit-appearance: textfield;
 }
 .oo-ui-textInputWidget [type="search"]::-ms-clear {
        display: none;

diff --git a/resources/lib/oojs-ui/oojs-ui-core-mediawiki.css b/resources/lib/oojs-ui/oojs-ui-core-mediawiki.css
index 074c1b2..431a9e4 100644 (file)
--- a/resources/lib/oojs-ui/oojs-ui-core-mediawiki.css
+++ b/resources/lib/oojs-ui/oojs-ui-core-mediawiki.css
@@ -1040,7 +1040,7 @@
        overflow: auto;
 }
 .oo-ui-textInputWidget [type="search"] {
-       -webkit-appearance: texfield;
+       -webkit-appearance: textfield;
 }
 .oo-ui-textInputWidget [type="search"]::-ms-clear {
        display: none;