| Index: trunk/extensions/MetavidWiki/includes/articlepages/MV_SequencePage.php |
| — | — | @@ -84,7 +84,8 @@ |
| 85 | 85 | 'interface_url' => str_replace('index.php', 'api.php', $wgServer . $wgScript), //api link (might be a better way to grab that) |
| 86 | 86 | 'linkback' => $this->mTitle->getFullURL(), |
| 87 | 87 | 'mTitle' => $this->mTitle->getPrefixedDBKey(), |
| 88 | | - 'mTalk' => $talkTitle->getPrefixedDBKey() |
| | 88 | + 'mTalk' => $talkTitle->getPrefixedDBKey(), |
| | 89 | + 'mTouchedTime' => wfTimestamp(TS_ISO_8601, $this->mTitle->getTouched()) |
| 89 | 90 | ); |
| 90 | 91 | foreach($metaData as $name=>$val){ |
| 91 | 92 | $titleNode = $this->smilDoc->createElement('meta'); |
| — | — | @@ -92,11 +93,22 @@ |
| 93 | 94 | $titleNode->setAttribute("content", htmlentities($val) ); |
| 94 | 95 | $headNode->appendChild($titleNode); |
| 95 | 96 | } |
| | 97 | + //add special meta wikiDesc: |
| | 98 | + $titleNode = $this->smilDoc->createElement('meta'); |
| | 99 | + $titleNode->setAttribute("name", htmlentities('wikiDesc') ); |
| | 100 | + $f = $titleNode->ownerDocument->createDocumentFragment(); |
| | 101 | + $f->appendXML( "<![CDATA[\n". |
| | 102 | + trim( $this->getPageContent() ). |
| | 103 | + "\n]]>"); |
| | 104 | + $titleNode->appendChild($f); |
| | 105 | + $headNode->appendChild( $titleNode ); |
| 96 | 106 | |
| | 107 | + |
| 97 | 108 | //add resolved transitions to the head: |
| 98 | 109 | $tranNodeList = $this->hlrdDoc->getElementsByTagName('transition'); |
| 99 | 110 | foreach ($tranNodeList as $tranNode){ |
| 100 | | - //for now do a direct copy (future we should do additional validation even though it should be validated on the way in) |
| | 111 | + //for now do a direct copy |
| | 112 | + //(future we should do additional validation even though it should be validated on the way in) |
| 101 | 113 | $node = $this->smilDoc->importNode($tranNode, true); |
| 102 | 114 | $headNode->appendChild($node); |
| 103 | 115 | } |
| — | — | @@ -251,9 +263,11 @@ |
| 252 | 264 | foreach($paramVars as $name=>$val){ |
| 253 | 265 | $phtml.='<param name="' . htmlentities($name) . '">' . htmlentities($val) . '</param>'; |
| 254 | 266 | } |
| 255 | | - $f = $node->ownerDocument->createDocumentFragment(); |
| 256 | | - $f->appendXML( $phtml ); |
| 257 | | - $node->appendChild($f); |
| | 267 | + if($phtml!=''){ |
| | 268 | + $f = $node->ownerDocument->createDocumentFragment(); |
| | 269 | + $f->appendXML( $phtml ); |
| | 270 | + $node->appendChild($f); |
| | 271 | + } |
| 258 | 272 | break; |
| 259 | 273 | case NS_IMAGE: |
| 260 | 274 | case NS_FILE: |
| — | — | @@ -713,8 +727,7 @@ |
| 714 | 728 | $markerList[] = $vidtag; |
| 715 | 729 | return $marker; |
| 716 | 730 | } |
| 717 | | - function getPageContent() { |
| 718 | | - global $wgRequest; |
| | 731 | + function getPageContent() { |
| 719 | 732 | $base_text = parent::getContent(); |
| 720 | 733 | // strip the sequence |
| 721 | 734 | $seqClose = strpos( $base_text, '</' . SEQUENCE_TAG . '>' ); |
| Index: trunk/extensions/MetavidWiki/skins/mv_search.js |
| — | — | @@ -81,12 +81,8 @@ |
| 82 | 82 | break; |
| 83 | 83 | case 'date_range': |
| 84 | 84 | $j('#mvs_'+inx+'_tc').html( gM('loading_txt') ); |
| 85 | | - var load_js_set = { 'Date.fromString':'jquery/plugins/date.js', |
| 86 | | - '$j.fn.datePicker':'jquery/plugins/jquery.datePicker.js'}; |
| 87 | | - if(embedTypes.msie6){ |
| 88 | | - js_log('using IE v6 need iframe as well'); |
| 89 | | - load_js_set['$j.fn.bgIframe'] = 'jquery/plugins/jquery.bgiframe.js'; |
| 90 | | - } |
| | 85 | + //@@todo refactor to new date range method |
| | 86 | + var load_js_set = ['$j.fn.datePicker']; |
| 91 | 87 | uri = wgServer + |
| 92 | 88 | ((wgServer == null) ? (wgScriptPath + "/index.php") : wgScript); |
| 93 | 89 | mvJsLoader.doLoad(load_js_set,function(){ |
| Index: trunk/extensions/MetavidWiki/skins/mv_allpages.js |
| — | — | @@ -12,18 +12,17 @@ |
| 13 | 13 | var wgScript = "/w/index.php"; |
| 14 | 14 | |
| 15 | 15 | if(typeof wgScriptPath=='undefined') |
| 16 | | - var wgScriptPath = '/w'; |
| 17 | | - |
| | 16 | + var wgScriptPath = '/w'; |
| | 17 | + |
| 18 | 18 | var gMvd={}; |
| 19 | 19 | function mv_setup_allpage(){ |
| 20 | 20 | js_log("mv embed done loading now setup 'all page'"); |
| 21 | 21 | //make sure we have jQuery and any base required libs: |
| 22 | 22 | mvJsLoader.jQueryCheck(function(){ |
| 23 | 23 | js_log('allpage_ did jquery check'); |
| 24 | | - mvJsLoader.doLoad( { |
| 25 | | - '$j.fn.autocomplete':'jquery/plugins/jquery.autocomplete.js', |
| 26 | | - '$j.fn.hoverIntent':'jquery/plugins/jquery.hoverIntent.js' |
| 27 | | - }, function(){ |
| | 24 | + mvJsLoader.doLoad( [ |
| | 25 | + '$j.fn.autocomplete' |
| | 26 | + ], function(){ |
| 28 | 27 | //js_log('allpage_ auto and hover check'+mv_setup_allpage_flag); |
| 29 | 28 | if( ! mv_setup_allpage_flag ){ |
| 30 | 29 | mv_setup_search_ac(); |
| Index: trunk/extensions/MetavidWiki/skins/mv_stream.js |
| — | — | @@ -59,14 +59,13 @@ |
| 60 | 60 | //load some additional plugins/components: |
| 61 | 61 | //:hoverIntent |
| 62 | 62 | //http://cherne.net/brian/resources/jquery.hoverIntent.html |
| 63 | | - mvJsLoader.doLoad({ |
| 64 | | - '$j.fn.autocomplete': 'jquery/plugins/jquery.autocomplete.js', |
| 65 | | - '$j.fn.hoverIntent' : 'jquery/plugins/jquery.hoverIntent.js', |
| 66 | | - '$j.ui' : 'jquery/jquery.ui-1.7.1/ui/ui.core.js', |
| 67 | | - '$j.ui.resizable' : 'jquery/jquery.ui-1.7.1/ui/ui.resizable.js', |
| 68 | | - 'mvClipEdit' : 'libClipEdit/mvClipEdit.js', |
| 69 | | - '$j.ui.draggable' : 'jquery/jquery.ui-1.7.1/ui/ui.draggable.js' |
| 70 | | - },function(){ |
| | 63 | + mvJsLoader.doLoad([ |
| | 64 | + '$j.fn.autocomplete', |
| | 65 | + '$j.ui', |
| | 66 | + '$j.ui.resizable', |
| | 67 | + 'mvClipEdit', |
| | 68 | + '$j.ui.draggable' |
| | 69 | + ],function(){ |
| 71 | 70 | //make sure mv_embed has done video re-write: |
| 72 | 71 | mv_stream_interface.init(); |
| 73 | 72 | }); |
| — | — | @@ -188,10 +187,8 @@ |
| 189 | 188 | selector='.mv_timeline_mvd_jumper,.mv_fd_mvd'; |
| 190 | 189 | } |
| 191 | 190 | js_log('selector: '+selector); |
| 192 | | - $j(selector).hoverIntent({ |
| 193 | | - interval:200, //polling interval |
| 194 | | - timeout:200, //delay before onMouseOut |
| 195 | | - over:function(){ |
| | 191 | + $j(selector).hover( |
| | 192 | + function(){ |
| 196 | 193 | //get the mvd_id (the last part of the this.id) |
| 197 | 194 | mvd_id = this.id.split('_').pop(); |
| 198 | 195 | //if timeline scroll to position: |
| — | — | @@ -204,7 +201,7 @@ |
| 205 | 202 | } |
| 206 | 203 | this_stream.mvdOver( mvd_id ); |
| 207 | 204 | }, |
| 208 | | - out:function(){ |
| | 205 | + function(){ |
| 209 | 206 | //get the mvd_id (the last part of the this.id) |
| 210 | 207 | mvd_id = this.id.split('_').pop(); |
| 211 | 208 | this_stream.mvdOut(mvd_id); |
| — | — | @@ -214,7 +211,7 @@ |
| 215 | 212 | return ; |
| 216 | 213 | }); |
| 217 | 214 | } |
| 218 | | - }); |
| | 215 | + ); |
| 219 | 216 | }, |
| 220 | 217 | mvdOver:function(mvd_id){ |
| 221 | 218 | js_log('f:mvdOver' + mvd_id ); |
| Index: trunk/extensions/MetavidWiki/maintenance/mv_update.php |
| — | — | @@ -137,5 +137,4 @@ |
| 138 | 138 | $wgDatabase->query( "ALTER TABLE `mv_mvd_index` ADD PRIMARY KEY(`mv_page_id`)" ); |
| 139 | 139 | print "done\n"; |
| 140 | 140 | } |
| 141 | | - |
| 142 | 141 | print "done with db tables update check\n"; |