Skip to content

Commit 8d7db90

Browse files
committed
Various small fixes. Bumping to 1.2.0 to indicate minor backwards incompatibility.
1 parent 7901207 commit 8d7db90

File tree

7 files changed

+20
-142
lines changed

7 files changed

+20
-142
lines changed

.DS_Store

-6 KB
Binary file not shown.

.gitignore

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1+
.svn
2+
*~
3+
*.kate-swp
4+
.*.swp
15
.DS_Store
2-
.idea
3-
*.sublime-workspace
4-
*.sublime-project

SpriteSheet.hooks.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ static public function generateSpriteOutput(Parser &$parser, PPFrame $frame, $ar
181181
return self::makeErrorBox();
182182
}
183183

184-
$html = $spriteSheet->getSpriteHtmlFromName($spriteName->getName(), $parameters['resize']['number']);
184+
$html = $spriteSheet->getSpriteHtmlFromName($spriteName->getName(), isset($parameters['resize']['number']) ? $parameters['resize']['number'] : null);
185185
} else {
186186
if (!isset($parameters['column']['integer']) || $parameters['column']['integer'] < 0) {
187187
self::setError('spritesheet_error_invalid_option', ['column', $parameters['column']['integer']]);
@@ -266,7 +266,7 @@ static public function generateSliceOutput(Parser &$parser, PPFrame $frame, $arg
266266
return self::makeErrorBox();
267267
}
268268

269-
$html = $spriteSheet->getSliceHtmlFromName($sliceName->getName(), $parameters['resize']['number'], $pixelMode);
269+
$html = $spriteSheet->getSliceHtmlFromName($sliceName->getName(), isset($parameters['resize']['number']) ? $parameters['resize']['number'] : null, $pixelMode);
270270
} else {
271271
//The unit of measure is allowed to be specified, but they must match to be valid.
272272
$unitParams = ['x', 'y', 'width', 'height'];
@@ -367,7 +367,7 @@ static private function cleanAndSetupParameters($arguments, PPFrame $frame) {
367367
if (isset($validParameters[$parameter])) {
368368
$cleanParameterOptions[$parameter] = $option;
369369

370-
if (is_array($validParameters[$parameter]['values'])) {
370+
if (isset($validParameters[$parameter]['values']) && is_array($validParameters[$parameter]['values'])) {
371371
if (!in_array($option, $validParameters[$parameter]['values'])) {
372372
//Throw an error.
373373
unset($cleanParameterOptions[$parameter]);
@@ -574,7 +574,7 @@ static public function onPageRenderingHash(&$hash, User $user, &$forOptions) {
574574
* @param string Reason given by the user performing the move.
575575
* @return boolean True
576576
*/
577-
static public function onTitleMoveComplete(Title &$oldTitle, Title &$newTitle, User &$user, $oldId, $newId, $reason = null) {
577+
static public function onTitleMoveComplete(Title &$oldTitle, Title &$newTitle, User $user, $oldId, $newId, $reason = null) {
578578
$spriteSheet = SpriteSheet::newFromTitle($oldTitle);
579579

580580
if (!$spriteSheet || !$spriteSheet->exists()) {

SpriteSheet.i18n.php

Lines changed: 0 additions & 35 deletions
This file was deleted.

SpriteSheet.php

Lines changed: 0 additions & 92 deletions
This file was deleted.

classes/SpriteSheet.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ public function setId($id) {
313313
* @return integer Sprite Sheet ID
314314
*/
315315
public function getId() {
316-
return intval($this->data['spritesheet_id']);
316+
return !isset($this->data['spritesheet_id']) ? 0 : intval($this->data['spritesheet_id']);
317317
}
318318

319319
/**
@@ -367,7 +367,7 @@ public function setColumns($columns) {
367367
* @return integer Columns
368368
*/
369369
public function getColumns() {
370-
return intval($this->data['columns']);
370+
return !isset($this->data['columns']) ? 0 : intval($this->data['columns']);
371371
}
372372

373373
/**
@@ -388,7 +388,7 @@ public function setRows($rows) {
388388
* @return integer Rows
389389
*/
390390
public function getRows() {
391-
return intval($this->data['rows']);
391+
return !isset($this->data['rows']) ? 0 : intval($this->data['rows']);
392392
}
393393

394394
/**
@@ -409,7 +409,7 @@ public function setInset($inset) {
409409
* @return integer Inset
410410
*/
411411
public function getInset() {
412-
return intval($this->data['inset']);
412+
return !isset($this->data['inset']) ? 0 : intval($this->data['inset']);
413413
}
414414

415415
/**

extension.json

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "SpriteSheet",
3-
"version": "1.1.5",
3+
"version": "1.2.0",
44
"author": [
55
"Curse Inc. Wiki Platform Team",
66
"Alexia E. Smith"
@@ -80,7 +80,11 @@
8080
"click_grid_for_preview",
8181
"no_results_named_sprites"
8282
],
83-
"position": "top"
83+
"position": "top",
84+
"targets": [
85+
"desktop",
86+
"mobile"
87+
]
8488
}
8589
},
8690
"ResourceFileModulePaths": {
@@ -107,5 +111,5 @@
107111
"SpriteSheetHooks::onLoadExtensionSchemaUpdates"
108112
]
109113
},
110-
"manifest_version": 1
111-
}
114+
"manifest_version": 2
115+
}

0 commit comments

Comments
 (0)