Merge branch 'release/1.5.4.0202'

Kenshin · Feb 2, 2019 · cc756b3 · cc756b3
2 parents a300e85 + b29b322
commit cc756b3
Show file tree

Hide file tree

Showing 12 changed files with 104 additions and 6 deletions.
diff --git a/_locales/en/messages.json b/_locales/en/messages.json
@@ -77,6 +77,10 @@
         "message": "Send to Mobile"
     },
 
+    "controlbar_desktop": {
+        "message": "Set wallpaper"
+    },
+
     "controlbar_favorite": {
         "message": "Like"
     },
@@ -505,6 +509,10 @@
         "message": "Custom CSS"
     },
 
+    "zen_mode_setting_script": {
+        "message": "Custom Script"
+    },
+
     "zen_mode_setting_import": {
         "message": "Import"
     },

diff --git a/_locales/zh_CN/messages.json b/_locales/zh_CN/messages.json
@@ -77,6 +77,10 @@
         "message": "发送到手机"
     },
 
+    "controlbar_desktop": {
+        "message": "设为桌面背景"
+    },
+
     "controlbar_favorite": {
         "message": "收藏"
     },
@@ -505,6 +509,10 @@
         "message": "自定义样式"
     },
 
+    "zen_mode_setting_script": {
+        "message": "自定义脚本"
+    },
+
     "zen_mode_setting_import": {
         "message": "导入配置"
     },

diff --git a/_locales/zh_TW/messages.json b/_locales/zh_TW/messages.json
@@ -77,6 +77,10 @@
         "message": "發送到手機"
     },
 
+    "controlbar_desktop": {
+        "message": "設為桌面背景"
+    },
+
     "controlbar_favorite": {
         "message": "收藏"
     },
@@ -505,6 +509,10 @@
         "message": "自定義樣式"
     },
 
+    "zen_mode_setting_script": {
+        "message": "自定義腳本"
+    },
+
     "zen_mode_setting_import": {
         "message": "導入配置"
     },

diff --git a/assets/css/main.css b/assets/css/main.css
@@ -291,6 +291,10 @@ img {
     background-image: url("../images/mobile.png");
 }
 
+.desktopicon {
+    background-image: url("../images/desktop.png");
+}
+
 /*
 * clock
 */
@@ -1547,7 +1551,7 @@ img {
     bottom: 5px;
 
     width: 500px;
-    height: 400px;
+    height: 420px;
 
     padding: 15px;
 
@@ -1856,7 +1860,7 @@ img {
     bottom: 10px;
 
     width: 400px;
-    height: 465px;
+    height: 575px;
 
     padding: 15px;
 
@@ -2048,7 +2052,8 @@ img {
     font-size: large!important;
 }
 
-.setting-zen-mode .css textarea {
+.setting-zen-mode .css textarea,
+.setting-zen-mode .script textarea {
     max-width: 395px;
     height: 60px;
 }

diff --git a/assets/images/desktop.png b/assets/images/desktop.png
diff --git a/js/background.js b/js/background.js
@@ -180,6 +180,8 @@ define([ "jquery", "date", "i18n", "setting", "apis", "vo", "files", "controlbar
             console.log( "======= New Background Obj is ", vo );
             localStorage[ "simptab-background-mode" ] == "time" && history.Add( vo.new );
             localStorage[ "simptab-background-mode" ] == "time" && $( "body" ).hasClass("bgearth") && $( "body" ).removeClass( "bgearth" );
+            // test code
+            //localStorage[ "simptab-background-mode" ] == "time" && $( ".controlink[url=desktop]" )[0].click();
         }
     }
 

diff --git a/js/controlbar.js b/js/controlbar.js
@@ -120,6 +120,16 @@ define([ "jquery", "i18n", "vo", "date", "files", "setting", "manage", "about",
                 $( $( ".controlbar" ).find( "a" )[2] ).parent().removeClass( "horz-toolbox-show-3" );
             });
 
+            $( ".controlink[url=mobile]" ).mouseenter( function( event ) {
+                $( ".controlink[url=mobile]" ).prev().addClass( "horz-toolbox-show" );
+                $( ".controlink[url=desktop]" ).parent().addClass( "horz-toolbox-show-1" );
+            });
+
+            $($( ".controlbar li" )[12]).mouseleave( function( event ) {
+                $( ".controlink[url=mobile]" ).prev().removeClass( "horz-toolbox-show" );
+                $( ".controlink[url=desktop]" ).parent().removeClass( "horz-toolbox-show-1" );
+            });
+
             // listen control link
             $( ".controlink" ).click( function( event ) {
                 var $target =  $( event.currentTarget ),
@@ -228,6 +238,20 @@ define([ "jquery", "i18n", "vo", "date", "files", "setting", "manage", "about",
                             new Notify().Render( 2, i18n.GetLang( "notify_mobile_send_failed" ) );
                         });
                         break;
+                    case "desktop":
+                        $.ajax({
+                            type       : "POST",
+                            url        : "http://localhost:56789/save",
+                            data       : files.DataURI(),
+                        }).then( function( result ) {
+                            result = JSON.parse( result );
+                            if ( result && result.code == 200 ) {
+                                new Notify().Render( "已成功发送到本地。" );
+                            }
+                        } , function( jqXHR, textStatus, errorThrown ) {
+                            console.log( jqXHR, textStatus, errorThrown )
+                        });
+                    break;
                 }
             });
         },

diff --git a/js/i18n.js b/js/i18n.js
@@ -23,6 +23,7 @@ define([ "jquery" ], function( $ ) {
         $( ".controlbar" ).find( "a[url=options]" ).attr("data-balloon", i18n( "controlbar_options" ));
         $( ".controlbar" ).find( "a[url=about]" ).attr("data-balloon", i18n( "controlbar_about" ));
         $( ".controlbar" ).find( "a[url=mobile]" ).attr("data-balloon", i18n( "controlbar_mobile" ));
+        $( ".controlbar" ).find( "a[url=desktop]" ).attr("data-balloon", i18n( "controlbar_desktop" ));
         $( ".controlbar" ).find( "a[url=favorite]" ).attr("data-balloon", i18n( "controlbar_favorite" ));
         $( ".controlbar" ).find( "a[url=pin]" ).attr("data-balloon", i18n( "controlbar_pin" ));
         $( ".controlbar" ).find( "a[url=dislike]" ).attr("data-balloon", i18n( "controlbar_dislike" ));

diff --git a/js/shortcuts.js b/js/shortcuts.js
@@ -21,7 +21,8 @@ define([ "jquery", "mousetrap", "controlbar", "i18n", "topsites", "message" ], f
             { short: "o", long: "options"  },
             { short: "t", long: "about"    },
             { short: "s", long: "setting"  },
-            { short: "b", long: "mobile"   },
+            { short: "d", long: "desktop"  },
+            { short: "e", long: "mobile"   },
             { short: "a", long: "favorite" },
             { short: "n", long: "pin"      },
             { short: "u", long: "dislike"  },

diff --git a/js/zen.js b/js/zen.js
@@ -17,6 +17,7 @@ define([ "jquery", "mousetrap", "lodash", "notify", "i18n", "message", "comps" ]
                 devices : { color: "", display: "true" },
                 topsites: { display: "true" },
                 css     : "",
+                script  : "",
                 version : chrome.runtime.getManifest().version.replace( /.\d{2,}/, "" ),
             },
             key     = "simptab-tenmode-option",
@@ -92,6 +93,19 @@ define([ "jquery", "mousetrap", "lodash", "notify", "i18n", "message", "comps" ]
         $( "head" ).append( '<style id="zen-mode-style" type="text/css">' + storage.db.css + '</style>' );
     }
 
+    function run() {
+        try {
+            var func = function ( source ) {
+                window.Notify   = Notify;
+                window.template = _.template;
+                return '( function ( $$version, Notify, template ) {' + source + '})( "0.0.1", Notify, template );'
+            };
+            new Function( func( storage.db.script ) )();
+        } catch ( error ) {
+            console.error( error )
+        }
+    }
+
     function correctWinSize() {
         navigator.platform.toLowerCase() == "win32" && storage.db.size == "middle" && $( "#time" ).addClass( "time-zen-mode-middle-win" );
         navigator.platform.toLowerCase() == "win32" && storage.db.size == "large"  && $( "#time" ).addClass( "time-zen-mode-large-win" );
@@ -250,6 +264,22 @@ define([ "jquery", "mousetrap", "lodash", "notify", "i18n", "message", "comps" ]
         });
     }
 
+    /*********************************************
+     * Script
+     *********************************************/
+
+    function scriptView() {
+        return '<div class="content"><textarea class="md-textarea"></textarea></div>';
+    }
+
+    function scriptModel() {
+        $( ".setting-zen-mode .script textarea" ).val( storage.db.script );
+        $( ".setting-zen-mode" ).on( "keyup", ".script textarea", function( event ) {
+            storage.db.script = event.target.value;
+            storage.Set();
+        });
+    }
+
     /*********************************************
      * Footer
      *********************************************/
@@ -312,6 +342,10 @@ define([ "jquery", "mousetrap", "lodash", "notify", "i18n", "message", "comps" ]
                             <div class="title">' + i18n.GetLang( "zen_mode_setting_css" ) + '</div>\
                             ' + cssView() + '\
                         </div>\
+                        <div class="script" style="margin-top: 15px;">\
+                            <div class="title">' + i18n.GetLang( "zen_mode_setting_script" ) + '</div>\
+                            ' + scriptView() + '\
+                        </div>\
                         <div class="footer">\
                             <div class="waves-effect button import">' + i18n.GetLang( "zen_mode_setting_import" ) + '</div>\
                             <div class="waves-effect button export">' + i18n.GetLang( "zen_mode_setting_export" ) + '</div>\
@@ -324,6 +358,7 @@ define([ "jquery", "mousetrap", "lodash", "notify", "i18n", "message", "comps" ]
         themeModel();
         moduleModel();
         cssModel();
+        scriptModel();
         footerModel();
     }
 
@@ -373,6 +408,7 @@ define([ "jquery", "mousetrap", "lodash", "notify", "i18n", "message", "comps" ]
         $( ".controlbar" ).addClass( "controlbar-zen-mode" );
         $( ".progress"   ).addClass( "progress-zen-mode" );
         $( ".clock"      ).append( '<div class="setting-trigger-zen-mode"></div>' );
+        storage.db.script != "" && run();
         custom();
         storage.db.theme == "#ffffff" && $( ".setting-trigger-zen-mode" ).addClass( "setting-trigger-white-zen-mode" );
         $( ".setting-trigger-zen-mode" ).on( "click", function( event ) {

diff --git a/main.html b/main.html
@@ -36,7 +36,12 @@
                 </ul>
                 <a data-balloon="Option" data-balloon-pos="up" class="controlink" href="#" url="setting"><span class="icon settingicon"></span></a>
             </li>
-            <li><a data-balloon="Mobile" data-balloon-pos="left" class="controlink" href="#" url="mobile"><span class="icon mobileicon"></span></a></li>
+            <li>
+                <ul class="horz-toolbox">
+                    <li><a style="display: none;" data-balloon="Desktop" data-balloon-pos="up" class="controlink" href="#" url="desktop"><span class="icon desktopicon"></span></a></li>
+                </ul>
+                <a data-balloon="Mobile" data-balloon-pos="up" class="controlink" href="#" url="mobile"><span class="icon mobileicon"></span></a>
+            </li>
             <li><a data-balloon="Favorite" data-balloon-pos="left" class="controlink" href="#" url="favorite"><span class="icon unfavoriteicon"></span></a></li>
             <li><a data-balloon="Pin" data-balloon-pos="left" class="controlink" href="#" url="pin"><span class="icon pin"></span></a></li>
             <li><a data-balloon="Dislike" data-balloon-pos="left"class="controlink" href="#" url="dislike"><span class="icon dislike"></span></a></li>

diff --git a/manifest.json b/manifest.json
@@ -2,7 +2,7 @@
     "manifest_version": 2,
     "name"            : "__MSG_extension_name__",
     "short_name"      : "SimpTab",
-    "version"         : "1.5.4",
+    "version"         : "1.5.4.202",
     "default_locale"  : "zh_CN",
     "description"     : "__MSG_extension_desc__",
     "author"          : "Kenshin",