Skip to content
This repository has been archived by the owner on Jan 30, 2020. It is now read-only.

Commit

Permalink
JSON -> Json
Browse files Browse the repository at this point in the history
- Renamed all directories and filenames from JSON to Json
- renamed all namespaces and classnames from JSON to Json
- Renamed methods and options that contained the verbiage "JSON" to contain the
  verbiage "Json"
  • Loading branch information
weierophinney committed Jul 20, 2010
3 parents e331113 + b288c81 + a7e1ad0 commit 4dca7a7
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions src/Adapter/JsPull.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@
*/
namespace Zend\ProgressBar\Adapter;

use Zend\JSON\JSON;
use Zend\Json\Json;

/**
* Zend_ProgressBar_Adapter_JsPull offers a simple method for updating a
* progressbar in a browser.
*
* @uses \Zend\JSON\JSON
* @uses \Zend\Json\Json
* @uses \Zend\ProgressBar\Adapter\Adapter
* @category Zend
* @package Zend_ProgressBar
Expand Down Expand Up @@ -79,7 +79,7 @@ public function notify($current, $max, $percent, $timeTaken, $timeRemaining, $te
'finished' => false
);

$data = JSON::encode($arguments);
$data = Json::encode($arguments);

// Output the data
$this->_outputData($data);
Expand All @@ -92,7 +92,7 @@ public function notify($current, $max, $percent, $timeTaken, $timeRemaining, $te
*/
public function finish()
{
$data = JSON::encode(array('finished' => true));
$data = Json::encode(array('finished' => true));

$this->_outputData($data);
}
Expand Down
6 changes: 3 additions & 3 deletions src/Adapter/JsPush.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@
*/
namespace Zend\ProgressBar\Adapter;

use Zend\JSON\JSON;
use Zend\Json\Json;

/**
* Zend_ProgressBar_Adapter_JsPush offers a simple method for updating a
* progressbar in a browser.
*
* @uses \Zend\JSON\JSON
* @uses \Zend\Json\Json
* @uses \Zend\ProgressBar\Adapter\Adapter
* @category Zend
* @package Zend_ProgressBar
Expand Down Expand Up @@ -101,7 +101,7 @@ public function notify($current, $max, $percent, $timeTaken, $timeRemaining, $te
);

$data = '<script type="text/javascript">'
. 'parent.' . $this->_updateMethodName . '(' . JSON::encode($arguments) . ');'
. 'parent.' . $this->_updateMethodName . '(' . Json::encode($arguments) . ');'
. '</script>';

// Output the data
Expand Down

0 comments on commit 4dca7a7

Please sign in to comment.