Merge remote-tracking branch 'origin/V4.0' into V5

Author: sanluan

publiccms-parent/publiccms/src/main/webapp/resource/plugins/ueditor/dialogs/image/image.css

@@ -91,9 +91,6 @@
     background-position: -60px 0;
 }
 
-
-
-
 /* 远程图片样式 */
 #remote {
     z-index: 200;
@@ -703,4 +700,4 @@
     height: 107px;
     border: 3px solid #1094fa;
     background-position: 72px 72px;
-}
+}

publiccms-parent/publiccms/src/main/webapp/resource/plugins/ueditor/dialogs/image/image.js

@@ -262,7 +262,7 @@
             height = (!ow || !oh) ? '':width*oh/ow;
 
             if(url) {
-                preview.innerHTML = '<img src="' + url + '" width="' + width + '" height="' + height + '" border="' + border + 'px solid #000" title="' + title + '" />';
+                preview.innerHTML = '<img src="' + url + '" width="' + width + '" height="' + height + '" border="' + border + 'px solid #000" alt="' + title + '" />';
             }
         },
         getInsertList: function () {

publiccms-parent/publiccms/src/main/webapp/resource/plugins/ueditor/dialogs/video/video.css

@@ -1,6 +1,9 @@
 @charset "utf-8";
 .wrapper{ width: 570px;_width:575px;margin: 10px auto; zoom:1;position: relative}
-.tabbody{height: 365px;}
+.tabhead {
+    float:left;
+}
+.tabbody{height: 365px;clear:both;}
 .tabbody .panel {
     position: absolute;
     width: 0;
@@ -16,6 +19,19 @@
 }
 
 .tabbody .panel table td{vertical-align: middle;}
+
+.alignBar{
+    float:right;
+    margin-top: 5px;
+    position: relative;
+}
+
+.alignBar .algnLabel{
+    float:left;
+    height: 20px;
+    line-height: 20px;
+}
+
 #videoUrl,#posterUrl {
     width: 440px;
     height: 21px;
@@ -64,9 +80,6 @@ label.url{font-weight: bold;margin-left: 5px;color: #06c;}
 #videoFloat .focus{opacity: 1;filter: alpha(opacity = 100)}
 span.view{display: inline-block;width: 30px;float: right;cursor: pointer;color: blue}
 
-
-
-
 /* upload video */
 .tabbody .upload.panel {
     width: 100%;

publiccms-parent/publiccms/src/main/webapp/resource/plugins/ueditor/dialogs/video/video.html

@@ -17,6 +17,10 @@
 			<span tabSrc="uploadImage" data-content-id="uploadImage"><var id="lang_tab_uploadI"></var></span>
 			<span tabSrc="onlineImage" data-content-id="onlineImage"><var id="lang_tab_onlineImage"></var></span>
         </div>
+        <div class="alignBar">
+            <label class="algnLabel"><var id="lang_input_autoplay"></var></label>
+            <input id="autoplay" name="autoplay" type="checkbox" value="autoplay"/>
+        </div>
         <div id="tabBodys" class="tabbody">
             <div id="video" class="panel focus">
                <table>

publiccms-parent/publiccms/src/main/webapp/resource/plugins/ueditor/dialogs/video/video.js

@@ -77,12 +77,12 @@
     /* 初始化视频标签 */
     function initVideo(){
         createAlignButton( ["videoFloat", "upload_alignment"] );
-        addUrlChangeListener($G("videoUrl"), $G("posterUrl"));
+        addUrlChangeListener($G("videoUrl"), $G("posterUrl"), $G("autoplay"));
         addOkListener();
 
         //编辑视频时初始化相关信息
         (function(){
-            var img = editor.selection.getRange().getClosedNode(),url,poster;
+            var img = editor.selection.getRange().getClosedNode(),url,poster,autoplay;
             if(img && img.className){
                 var hasFakedClass = (img.className == "edui-faked-video"),
                     hasUploadClass = img.className.indexOf("edui-upload-video")!=-1;
@@ -91,6 +91,7 @@
                     $G("posterUrl").value = poster = img.getAttribute("poster");
                     $G("videoWidth").value = img.width;
                     $G("videoHeight").value = img.height;
+                    $G("autoplay").checked = autoplay = img.getAttribute("autoplay")||false;
                     var align = domUtils.getComputedStyle(img,"float"),
                         parentAlign = domUtils.getComputedStyle(img.parentNode,"text-align");
                     updateAlignButton(parentAlign==="center"?"center":align);
@@ -99,7 +100,7 @@
                     isModifyUploadVideo = false;
                 }
             }
-            createPreviewVideo(url,poster);
+            createPreviewVideo(url,poster,autoplay);
         })();
     }
 
@@ -158,17 +159,19 @@
     function insertSingle(){
         var width = $G("videoWidth"),
             height = $G("videoHeight"),
-            url=$G('videoUrl').value,
+            url = $G('videoUrl').value,
             align = findFocus("videoFloat","name"),
-            poster = $G('posterUrl').value;
+            poster = $G('posterUrl').value,
+            autoplay = $G('autoplay').checked ;
         if(!url) return false;
         if ( !checkNum( [width, height] ) ) return false;
         editor.execCommand('insertvideo', {
             url: convert_url(url),
             width: width.value,
             height: height.value,
             align: align,
-            poster : poster
+            poster : poster,
+            autoplay : autoplay
         }, isModifyUploadVideo ? 'upload':null);
     }
 
@@ -179,6 +182,7 @@
             width = parseInt($G('upload_width').value, 10) || 600,
             height = parseInt($G('upload_height').value, 10) || 480,
             align = findFocus("upload_alignment","name") || 'center',
+            autoplay = $G('autoplay').checked,
             poster = $G('posterUrl').value;
         var imageList=[];
 
@@ -219,8 +223,10 @@
                 width:width,
                 height:height,
                 align:align,
-                poster:poster
+                poster:poster,
+                autoplay:autoplay
             });
+            autoplay=false;
         }
 
         if (uploadFile && uploadFile.getQueueCount()) {
@@ -325,30 +331,24 @@
      * @param url
      * @param poster
      */
-    function addUrlChangeListener(url, poster){
-        if (browser.ie) {
-            url.onpropertychange = function () {
-                createPreviewVideo( this.value, poster.value );
-            }
-            poster.onpropertychange = function () {
-                createPreviewVideo( url.value, this.value);
-            }
-        } else {
-            url.addEventListener( "input", function () {
-                createPreviewVideo( this.value, poster.value );
-            }, false );
-            poster.addEventListener( "input", function () {
-                createPreviewVideo( url.value, this.value );
-            }, false );
-        }
+    function addUrlChangeListener(url, poster, autoplay){
+        url.addEventListener( "input", function () {
+            createPreviewVideo( this.value, poster.value, autoplay.checked );
+        }, false );
+        poster.addEventListener( "input", function () {
+            createPreviewVideo( url.value, this.value, autoplay.checked );
+        }, false );
+        autoplay.addEventListener( "change", function () {
+            createPreviewVideo( url.value, poster.value, this.checked);
+        }, false );
     }
 
     /**
      * 根据url生成视频预览
      * @param url
      * @param poster
      */
-    function createPreviewVideo(url, poster){
+    function createPreviewVideo(url, poster , autoplay){
         if ( !url )return;
 
         var conUrl = convert_url(url);
@@ -358,7 +358,7 @@
         var ext = url.substr(url.lastIndexOf('.') + 1);
         if(ext == 'ogv') ext = 'ogg';
         $G("preview").innerHTML = '<div class="previewMsg"><span>'+lang.urlError+'</span></div>'+
-        '<video class="previewVideo video-js" controls preload="none" ' + (poster ? ' poster="' + poster + '"': '') +
+        '<video class="previewVideo video-js" controls preload="none" ' + (poster ? ' poster="' + poster + '"': '') + (autoplay ? ' autoplay="' + autoplay + '"': '') +
             ' src="' + conUrl + '"' +
             ' width="' + 420  + '"' +
             ' height="' + 280  + '">' +

publiccms-parent/publiccms/src/main/webapp/resource/plugins/ueditor/lang/en/en.js

@@ -357,7 +357,7 @@ UE.I18N['en'] = {
             'lang_videoW':"Width",
             'lang_videoH':"Height",
             'lang_alignment':"Alignment",
-
+            'lang_input_autoplay':"Auto play",
             'lang_input_fileStatus':' No file uploaded!',
             'startUpload':{'style':"background:url(upload.png) no-repeat;"},
             'lang_videoLoading':"　Loading...",

publiccms-parent/publiccms/src/main/webapp/resource/plugins/ueditor/lang/ja-jp/ja-jp.js

@@ -351,6 +351,7 @@ UE.I18N['ja-jp'] = {
             'lang_videoW':"幅",
             'lang_videoH':"高さ",
             'lang_alignment':"配置",
+            'lang_input_autoplay':"オートプレイ",
             'lang_input_fileStatus':' ファイルをアップロードしていません',
             'startUpload':{'style':"background:url(upload.png) no-repeat;"},
             'lang_videoLoading':"　ビデオの読み込み...",

publiccms-parent/publiccms/src/main/webapp/resource/plugins/ueditor/lang/zh-cn/zh-cn.js

@@ -356,6 +356,7 @@ UE.I18N['zh-cn'] = {
             'lang_videoW':"宽度",
             'lang_videoH':"高度",
             'lang_alignment':"对齐方式",
+            'lang_input_autoplay':"自动播放",
             'lang_input_fileStatus':' 当前未上传文件',
             'startUpload':{'style':"background:url(upload.png) no-repeat;"},
             'lang_videoLoading':"　视频加载中……",