Changeset 398434
- Timestamp:
- 06/17/2011 04:38:12 PM (15 years ago)
- Location:
- html5avmanager
- Files:
-
- 79 added
- 3 edited
-
tags/0.1.8 (added)
-
tags/0.1.8/api.php (added)
-
tags/0.1.8/html5avmanager.php (added)
-
tags/0.1.8/lib (added)
-
tags/0.1.8/lib/blank.js (added)
-
tags/0.1.8/lib/dbal.php (added)
-
tags/0.1.8/lib/jquery.js (added)
-
tags/0.1.8/lib/mediaelement (added)
-
tags/0.1.8/lib/mediaelement/Thumbs.db (added)
-
tags/0.1.8/lib/mediaelement/background.png (added)
-
tags/0.1.8/lib/mediaelement/bigplay.png (added)
-
tags/0.1.8/lib/mediaelement/controls-ted.png (added)
-
tags/0.1.8/lib/mediaelement/controls-wmp-bg.png (added)
-
tags/0.1.8/lib/mediaelement/controls-wmp.png (added)
-
tags/0.1.8/lib/mediaelement/controls.png (added)
-
tags/0.1.8/lib/mediaelement/flashmediaelement.swf (added)
-
tags/0.1.8/lib/mediaelement/jquery.js (added)
-
tags/0.1.8/lib/mediaelement/loading.gif (added)
-
tags/0.1.8/lib/mediaelement/mediaelement-and-player.js (added)
-
tags/0.1.8/lib/mediaelement/mediaelement-and-player.min.js (added)
-
tags/0.1.8/lib/mediaelement/mediaelement.js (added)
-
tags/0.1.8/lib/mediaelement/mediaelement.min.js (added)
-
tags/0.1.8/lib/mediaelement/mediaelementplayer.css (added)
-
tags/0.1.8/lib/mediaelement/mediaelementplayer.js (added)
-
tags/0.1.8/lib/mediaelement/mediaelementplayer.min.css (added)
-
tags/0.1.8/lib/mediaelement/mediaelementplayer.min.js (added)
-
tags/0.1.8/lib/mediaelement/mejs-skins.css (added)
-
tags/0.1.8/lib/mediaelement/silverlightmediaelement.xap (added)
-
tags/0.1.8/lib/model (added)
-
tags/0.1.8/lib/model/html5av_audio_video.php (added)
-
tags/0.1.8/lib/model/html5av_source.php (added)
-
tags/0.1.8/lib/model/html5av_track.php (added)
-
tags/0.1.8/lib/time.php (added)
-
tags/0.1.8/lib/uploadify (added)
-
tags/0.1.8/lib/uploadify/cancel.png (added)
-
tags/0.1.8/lib/uploadify/check.php (added)
-
tags/0.1.8/lib/uploadify/custom.php (added)
-
tags/0.1.8/lib/uploadify/expressInstall.swf (added)
-
tags/0.1.8/lib/uploadify/jquery.uploadify.js (added)
-
tags/0.1.8/lib/uploadify/uploadify.allglyphs.swf (added)
-
tags/0.1.8/lib/uploadify/uploadify.css (added)
-
tags/0.1.8/lib/uploadify/uploadify.fla (added)
-
tags/0.1.8/lib/uploadify/uploadify.swf (added)
-
tags/0.1.8/license.txt (added)
-
tags/0.1.8/readme.txt (added)
-
tags/0.1.8/screenshot-1.png (added)
-
tags/0.1.8/screenshot-2.png (added)
-
tags/0.1.8/screenshot-3.png (added)
-
tags/0.1.8/screenshot-4.png (added)
-
tags/0.1.8/screenshot-5.png (added)
-
tags/0.1.8/screenshot-6.png (added)
-
tags/0.1.8/screenshot-7.png (added)
-
tags/0.1.8/screenshot-8.png (added)
-
tags/0.1.8/sql (added)
-
tags/0.1.8/sql/main.sql (added)
-
tags/0.1.8/sql/update (added)
-
tags/0.1.8/view (added)
-
tags/0.1.8/view/admin (added)
-
tags/0.1.8/view/admin/audio-add-panel.php (added)
-
tags/0.1.8/view/admin/audio-edit-panel.php (added)
-
tags/0.1.8/view/admin/no-av.php (added)
-
tags/0.1.8/view/admin/settings-panel.php (added)
-
tags/0.1.8/view/admin/source-external-panel.php (added)
-
tags/0.1.8/view/admin/source-panel.php (added)
-
tags/0.1.8/view/admin/track-external-panel.php (added)
-
tags/0.1.8/view/admin/track-panel.php (added)
-
tags/0.1.8/view/admin/video-add-panel.php (added)
-
tags/0.1.8/view/admin/video-audio-manager-page.php (added)
-
tags/0.1.8/view/admin/video-audio-manager-pagenation.php (added)
-
tags/0.1.8/view/admin/video-audio-manager-panel.php (added)
-
tags/0.1.8/view/admin/video-edit-panel.php (added)
-
tags/0.1.8/view/admin/widget.php (added)
-
tags/0.1.8/view/videoaudio (added)
-
tags/0.1.8/view/videoaudio/audio-default.php (added)
-
tags/0.1.8/view/videoaudio/audio-xml.php (added)
-
tags/0.1.8/view/videoaudio/setting.php (added)
-
tags/0.1.8/view/videoaudio/video-default.php (added)
-
tags/0.1.8/view/videoaudio/video-xml.php (added)
-
trunk/api.php (modified) (2 diffs)
-
trunk/html5avmanager.php (modified) (5 diffs)
-
trunk/readme.txt (modified) (2 diffs)
-
trunk/view/admin/no-av.php (added)
Legend:
- Unmodified
- Added
- Removed
-
html5avmanager/trunk/api.php
r397419 r398434 110 110 list($firstPage, $lastPage) = html5av_audio_video_table::pager(); 111 111 $currentPage = self::$param['page']; 112 113 if($lastPage <= 1) { 114 echo ''; 115 return; 116 } 112 117 113 118 $pages = array(); … … 143 148 $page = (int) self::$param['page']; 144 149 $tempVideoAudios = html5av_audio_video_table::getPage($page); 150 151 if(!count($tempVideoAudios)) { 152 include 'view/admin/no-av.php'; 153 return; 154 } 155 145 156 $AVs = array(); 146 157 foreach ($tempVideoAudios as $videoAudio) { -
html5avmanager/trunk/html5avmanager.php
r397939 r398434 5 5 Plugin URI: http://cj-jackson.com/ 6 6 Description: A video manager with a Modal-View-Controller and video uploader. 7 Version: 0.1. 77 Version: 0.1.8 8 8 Author: Christopher John Jackson 9 9 Author URI: http://cj-jackson.com/ … … 11 11 */ 12 12 13 /** 14 * Copyright (c) 2011 Christopher John Jackson 15 * 16 * Permission is hereby granted, free of charge, to any person obtaining a copy of 17 * this software and associated documentation files (the "Software"), to deal in 18 * the Software without restriction, including without limitation the rights to 19 * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies 20 * of the Software, and to permit persons to whom the Software is furnished to do 21 * so, subject to the following conditions: 22 * 23 * The above copyright notice and this permission notice shall be included in all 24 * copies or substantial portions of the Software. 25 * 26 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 27 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 28 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 29 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 30 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 31 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 32 * SOFTWARE. 33 */ 13 34 require_once 'lib/time.php'; 14 35 require_once 'lib/dbal.php'; … … 208 229 209 230 static public function scripts() { 210 wp_deregister_script('jquery');211 wp_deregister_script('jquery-ui-core');212 wp_deregister_script('jquery-ui-tabs');213 wp_deregister_script('jquery-ui-sortable');214 wp_deregister_script('jquery-ui-draggable');215 wp_deregister_script('jquery-ui-dropable');216 wp_deregister_script('jquery-ui-selectable');217 wp_deregister_script('jquery-ui-resizable');218 wp_deregister_script('jquery-ui-dialog');219 wp_register_script('jquery', self::getUrl() . '/lib/jquery.js', null, '1.6.x');220 wp_register_script('jquery-ui-core',221 'https://ajax.googleapis.com/ajax/libs/jqueryui/1.8/jquery-ui.min.js',222 null, '1.8.x');223 wp_register_script('jquery-ui-tabs', self::getUrl() . '/lib/blank.js');224 wp_register_script('jquery-ui-sortable', self::getUrl() . '/lib/blank.js');225 wp_register_script('jquery-ui-draggable', self::getUrl() . '/lib/blank.js');226 wp_register_script('jquery-ui-dropable', self::getUrl() . '/lib/blank.js');227 wp_register_script('jquery-ui-selectable', self::getUrl() . '/lib/blank.js');228 wp_register_script('jquery-ui-resizable', self::getUrl() . '/lib/blank.js');229 wp_register_script('jquery-ui-dialog', self::getUrl() . '/lib/blank.js');231 if (!is_admin()) { 232 wp_deregister_script('jquery'); 233 wp_deregister_script('jquery-ui-core'); 234 wp_deregister_script('jquery-ui-tabs'); 235 wp_deregister_script('jquery-ui-sortable'); 236 wp_deregister_script('jquery-ui-draggable'); 237 wp_deregister_script('jquery-ui-dropable'); 238 wp_deregister_script('jquery-ui-selectable'); 239 wp_deregister_script('jquery-ui-resizable'); 240 wp_deregister_script('jquery-ui-dialog'); 241 wp_register_script('jquery', self::getUrl() . '/lib/jquery.js', null, '1.6.x'); 242 wp_register_script('jquery-ui-core', 'https://ajax.googleapis.com/ajax/libs/jqueryui/1.8/jquery-ui.min.js', null, '1.8.x'); 243 wp_register_script('jquery-ui-tabs', self::getUrl() . '/lib/blank.js'); 244 wp_register_script('jquery-ui-sortable', self::getUrl() . '/lib/blank.js'); 245 wp_register_script('jquery-ui-draggable', self::getUrl() . '/lib/blank.js'); 246 wp_register_script('jquery-ui-dropable', self::getUrl() . '/lib/blank.js'); 247 wp_register_script('jquery-ui-selectable', self::getUrl() . '/lib/blank.js'); 248 wp_register_script('jquery-ui-resizable', self::getUrl() . '/lib/blank.js'); 249 wp_register_script('jquery-ui-dialog', self::getUrl() . '/lib/blank.js'); 250 } 230 251 if (is_admin()) { 231 252 wp_enqueue_script('jquery'); … … 514 535 static public function determineVideo($file) { 515 536 $type = self::getVideoType(); 516 537 517 538 $ext = strtolower(end(explode('.', $file))); 518 539 … … 530 551 static public function determineAudio($file) { 531 552 $type = self::getAudioType(); 532 553 533 554 $ext = strtolower(end(explode('.', $file))); 534 555 -
html5avmanager/trunk/readme.txt
r397939 r398434 5 5 Requires at least: 2.7 6 6 Tested up to: 3.2 7 Stable tag: 0.1. 77 Stable tag: 0.1.8 8 8 9 9 A HTML5 Audio and Video manager that take full advantage of … … 62 62 == Changelog == 63 63 64 = 0.1.8 = 65 * Fixed quirk with audio & video manager. 66 * Fixed glitch with with switching from Visual to HTML in post editor. 67 64 68 = 0.1.7 = 65 69 * No longer uses 'preg_match' to determine video or audio, uses
Note: See TracChangeset
for help on using the changeset viewer.